diff --git a/config/default_hs_internal_cfg_values.h b/config/default_hs_internal_cfg_values.h index 1eb213c..f3d803c 100644 --- a/config/default_hs_internal_cfg_values.h +++ b/config/default_hs_internal_cfg_values.h @@ -16,7 +16,7 @@ * limitations under the License. ************************************************************************/ - /** +/** * @file * CFS Health and Safety (HS) Application Private Config Definitions * diff --git a/fsw/inc/hs_interface_cfg.h b/fsw/inc/hs_interface_cfg.h index b1f3e04..733b053 100644 --- a/fsw/inc/hs_interface_cfg.h +++ b/fsw/inc/hs_interface_cfg.h @@ -79,8 +79,8 @@ * cFE size limit for a single buffered table set by the * #CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE parameter */ - #define HS_MAX_MSG_ACT_TYPES HS_INTERFACE_CFGVAL(MAX_MSG_ACT_TYPES) - #define DEFAULT_HS_MAX_MSG_ACT_TYPES 8 +#define HS_MAX_MSG_ACT_TYPES HS_INTERFACE_CFGVAL(MAX_MSG_ACT_TYPES) +#define DEFAULT_HS_MAX_MSG_ACT_TYPES 8 /** * \brief Maximum message action size (in bytes) @@ -103,8 +103,8 @@ * cFE size limit for a single buffered table set by the * #CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE parameter */ - #define HS_MAX_MSG_ACT_SIZE HS_INTERFACE_CFGVAL(MAX_MSG_ACT_SIZE) - #define DEFAULT_HS_MAX_MSG_ACT_SIZE 16 +#define HS_MAX_MSG_ACT_SIZE HS_INTERFACE_CFGVAL(MAX_MSG_ACT_SIZE) +#define DEFAULT_HS_MAX_MSG_ACT_SIZE 16 /** * \brief Maximum number of monitored applications @@ -128,8 +128,8 @@ * cFE size limit for a single buffered table set by the * #CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE parameter */ - #define HS_MAX_MONITORED_APPS HS_INTERFACE_CFGVAL(MAX_MONITORED_APPS) - #define DEFAULT_HS_MAX_MONITORED_APPS 32 +#define HS_MAX_MONITORED_APPS HS_INTERFACE_CFGVAL(MAX_MONITORED_APPS) +#define DEFAULT_HS_MAX_MONITORED_APPS 32 /** * \brief Maximum number of monitored events @@ -153,8 +153,8 @@ * cFE size limit for a single buffered table set by the * #CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE parameter */ - #define HS_MAX_MONITORED_EVENTS HS_INTERFACE_CFGVAL(MAX_MONITORED_EVENTS) - #define DEFAULT_HS_MAX_MONITORED_EVENTS 16 +#define HS_MAX_MONITORED_EVENTS HS_INTERFACE_CFGVAL(MAX_MONITORED_EVENTS) +#define DEFAULT_HS_MAX_MONITORED_EVENTS 16 /**\}*/ diff --git a/fsw/inc/hs_internal_cfg.h b/fsw/inc/hs_internal_cfg.h index a0f5b23..e710c49 100644 --- a/fsw/inc/hs_internal_cfg.h +++ b/fsw/inc/hs_internal_cfg.h @@ -47,8 +47,8 @@ * * This parameter must be greater than 0. */ - #define HS_WATCHDOG_TIMEOUT_VALUE HS_INTERNAL_CFGVAL(WATCHDOG_TIMEOUT_VALUE) - #define DEFAULT_HS_WATCHDOG_TIMEOUT_VALUE 10000 +#define HS_WATCHDOG_TIMEOUT_VALUE HS_INTERNAL_CFGVAL(WATCHDOG_TIMEOUT_VALUE) +#define DEFAULT_HS_WATCHDOG_TIMEOUT_VALUE 10000 /** * \brief Time to wait after performing processing (in milliseconds) @@ -63,8 +63,8 @@ * This parameter can't be larger than an unsigned 32 bit * integer (4294967295). */ - #define HS_POST_PROCESSING_DELAY HS_INTERNAL_CFGVAL(POST_PROCESSING_DELAY) - #define DEFAULT_HS_POST_PROCESSING_DELAY 0 +#define HS_POST_PROCESSING_DELAY HS_INTERNAL_CFGVAL(POST_PROCESSING_DELAY) +#define DEFAULT_HS_POST_PROCESSING_DELAY 0 /** * \brief Wakeup Message Software Bus Timeout @@ -82,8 +82,8 @@ * (#HS_WATCHDOG_TIMEOUT_VALUE * 1000) - HS runtime in ms * otherwise HS may not be able to service the watchdog in time. */ - #define HS_WAKEUP_TIMEOUT HS_INTERNAL_CFGVAL(WAKEUP_TIMEOUT) - #define DEFAULT_HS_WAKEUP_TIMEOUT 1200 +#define HS_WAKEUP_TIMEOUT HS_INTERNAL_CFGVAL(WAKEUP_TIMEOUT) +#define DEFAULT_HS_WAKEUP_TIMEOUT 1200 /** * \brief CPU aliveness output string @@ -96,8 +96,8 @@ * None. * */ - #define HS_CPU_ALIVE_STRING HS_INTERNAL_CFGVAL(CPU_ALIVE_STRING) - #define DEFAULT_HS_CPU_ALIVE_STRING "." +#define HS_CPU_ALIVE_STRING HS_INTERNAL_CFGVAL(CPU_ALIVE_STRING) +#define DEFAULT_HS_CPU_ALIVE_STRING "." /** * \brief CPU aliveness output period @@ -111,8 +111,8 @@ * integer (4294967295). * */ - #define HS_CPU_ALIVE_PERIOD HS_INTERNAL_CFGVAL(CPU_ALIVE_PERIOD) - #define DEFAULT_HS_CPU_ALIVE_PERIOD 5 +#define HS_CPU_ALIVE_PERIOD HS_INTERNAL_CFGVAL(CPU_ALIVE_PERIOD) +#define DEFAULT_HS_CPU_ALIVE_PERIOD 5 /** * \brief Max Number of Processor Resets that may be performed by HS @@ -132,8 +132,8 @@ * actions to the value set here. * */ - #define HS_MAX_RESTART_ACTIONS HS_INTERNAL_CFGVAL(MAX_RESTART_ACTIONS) - #define DEFAULT_HS_MAX_RESTART_ACTIONS 3 +#define HS_MAX_RESTART_ACTIONS HS_INTERNAL_CFGVAL(MAX_RESTART_ACTIONS) +#define DEFAULT_HS_MAX_RESTART_ACTIONS 3 /** * \brief Software bus command pipe depth @@ -145,8 +145,8 @@ * \par Limits: * This parameter must be greater than 0. */ - #define HS_CMD_PIPE_DEPTH HS_INTERNAL_CFGVAL(CMD_PIPE_DEPTH) - #define DEFAULT_HS_CMD_PIPE_DEPTH 12 +#define HS_CMD_PIPE_DEPTH HS_INTERNAL_CFGVAL(CMD_PIPE_DEPTH) +#define DEFAULT_HS_CMD_PIPE_DEPTH 12 /** * \brief Software bus event pipe depth @@ -160,8 +160,8 @@ * \par Limits: * This parameter must be greater than 0. */ - #define HS_EVENT_PIPE_DEPTH HS_INTERNAL_CFGVAL(EVENT_PIPE_DEPTH) - #define DEFAULT_HS_EVENT_PIPE_DEPTH 32 +#define HS_EVENT_PIPE_DEPTH HS_INTERNAL_CFGVAL(EVENT_PIPE_DEPTH) +#define DEFAULT_HS_EVENT_PIPE_DEPTH 32 /** * \brief Software bus wakeup pipe depth @@ -173,8 +173,8 @@ * \par Limits: * This parameter must be greater than 0. */ - #define HS_WAKEUP_PIPE_DEPTH HS_INTERNAL_CFGVAL(WAKEUP_PIPE_DEPTH) - #define DEFAULT_HS_WAKEUP_PIPE_DEPTH 1 +#define HS_WAKEUP_PIPE_DEPTH HS_INTERNAL_CFGVAL(WAKEUP_PIPE_DEPTH) +#define DEFAULT_HS_WAKEUP_PIPE_DEPTH 1 /** * \brief Time to wait before a processor reset (in milliseconds) @@ -187,8 +187,8 @@ * This parameter can't be larger than an unsigned 32 bit * integer (4294967295). */ - #define HS_RESET_TASK_DELAY HS_INTERNAL_CFGVAL(RESET_TASK_DELAY) - #define DEFAULT_HS_RESET_TASK_DELAY 50 +#define HS_RESET_TASK_DELAY HS_INTERNAL_CFGVAL(RESET_TASK_DELAY) +#define DEFAULT_HS_RESET_TASK_DELAY 50 /** * \brief Time to wait for all apps to be started (in milliseconds) @@ -207,8 +207,8 @@ * This should be greater than or equal to the Startup Sync timeout for * any application in the Application Monitor Table. */ - #define HS_STARTUP_SYNC_TIMEOUT HS_INTERNAL_CFGVAL(STARTUP_SYNC_TIMEOUT) - #define DEFAULT_HS_STARTUP_SYNC_TIMEOUT 65000 +#define HS_STARTUP_SYNC_TIMEOUT HS_INTERNAL_CFGVAL(STARTUP_SYNC_TIMEOUT) +#define DEFAULT_HS_STARTUP_SYNC_TIMEOUT 65000 /** * \brief Default State of the Application Monitor @@ -220,8 +220,8 @@ * \par Limits: * Must be HS_State_ENABLED or HS_State_DISABLED */ - #define HS_APPMON_DEFAULT_STATE HS_INTERNAL_CFGVAL(APPMON_DEFAULT_STATE) - #define DEFAULT_HS_APPMON_DEFAULT_STATE HS_State_ENABLED +#define HS_APPMON_DEFAULT_STATE HS_INTERNAL_CFGVAL(APPMON_DEFAULT_STATE) +#define DEFAULT_HS_APPMON_DEFAULT_STATE HS_State_ENABLED /** * \brief Default State of the Event Monitor @@ -233,8 +233,8 @@ * \par Limits: * Must be HS_State_ENABLED or HS_State_DISABLED */ - #define HS_EVENTMON_DEFAULT_STATE HS_INTERNAL_CFGVAL(EVENTMON_DEFAULT_STATE) - #define DEFAULT_HS_EVENTMON_DEFAULT_STATE HS_State_DISABLED +#define HS_EVENTMON_DEFAULT_STATE HS_INTERNAL_CFGVAL(EVENTMON_DEFAULT_STATE) +#define DEFAULT_HS_EVENTMON_DEFAULT_STATE HS_State_DISABLED /** * \brief Default State of the Aliveness Indicator @@ -246,8 +246,8 @@ * \par Limits: * Must be HS_State_ENABLED or HS_State_DISABLED */ - #define HS_ALIVENESS_DEFAULT_STATE HS_INTERNAL_CFGVAL(ALIVENESS_DEFAULT_STATE) - #define DEFAULT_HS_ALIVENESS_DEFAULT_STATE HS_State_ENABLED +#define HS_ALIVENESS_DEFAULT_STATE HS_INTERNAL_CFGVAL(ALIVENESS_DEFAULT_STATE) +#define DEFAULT_HS_ALIVENESS_DEFAULT_STATE HS_State_ENABLED /** * \brief Default State of the CPU Hogging Indicator @@ -259,8 +259,8 @@ * \par Limits: * Must be HS_State_ENABLED or HS_State_DISABLED */ - #define HS_CPUHOG_DEFAULT_STATE HS_INTERNAL_CFGVAL(CPUHOG_DEFAULT_STATE) - #define DEFAULT_HS_CPUHOG_DEFAULT_STATE HS_State_ENABLED +#define HS_CPUHOG_DEFAULT_STATE HS_INTERNAL_CFGVAL(CPUHOG_DEFAULT_STATE) +#define DEFAULT_HS_CPUHOG_DEFAULT_STATE HS_State_ENABLED /** * \brief Application Monitor Table (AMT) filename @@ -273,8 +273,8 @@ * This string shouldn't be longer than #OS_MAX_PATH_LEN for the * target platform in question */ - #define HS_AMT_FILENAME HS_INTERNAL_CFGVAL(AMT_FILENAME) - #define DEFAULT_HS_AMT_FILENAME "/cf/hs_amt.tbl" +#define HS_AMT_FILENAME HS_INTERNAL_CFGVAL(AMT_FILENAME) +#define DEFAULT_HS_AMT_FILENAME "/cf/hs_amt.tbl" /** * \brief Event Monitor Table (EMT) filename @@ -287,8 +287,8 @@ * This string shouldn't be longer than #OS_MAX_PATH_LEN for the * target platform in question */ - #define HS_EMT_FILENAME HS_INTERNAL_CFGVAL(EMT_FILENAME) - #define DEFAULT_HS_EMT_FILENAME "/cf/hs_emt.tbl" +#define HS_EMT_FILENAME HS_INTERNAL_CFGVAL(EMT_FILENAME) +#define DEFAULT_HS_EMT_FILENAME "/cf/hs_emt.tbl" /** * \brief Execution Counter Table (XCT) filename @@ -301,8 +301,8 @@ * This string shouldn't be longer than #OS_MAX_PATH_LEN for the * target platform in question */ - #define HS_XCT_FILENAME HS_INTERNAL_CFGVAL(XCT_FILENAME) - #define DEFAULT_HS_XCT_FILENAME "/cf/hs_xct.tbl" +#define HS_XCT_FILENAME HS_INTERNAL_CFGVAL(XCT_FILENAME) +#define DEFAULT_HS_XCT_FILENAME "/cf/hs_xct.tbl" /** * \brief Message Actions Table (MAT) filename @@ -315,8 +315,8 @@ * This string shouldn't be longer than #OS_MAX_PATH_LEN for the * target platform in question */ - #define HS_MAT_FILENAME HS_INTERNAL_CFGVAL(MAT_FILENAME) - #define DEFAULT_HS_MAT_FILENAME "/cf/hs_mat.tbl" +#define HS_MAT_FILENAME HS_INTERNAL_CFGVAL(MAT_FILENAME) +#define DEFAULT_HS_MAT_FILENAME "/cf/hs_mat.tbl" /** * \brief System monitor PSP @@ -329,8 +329,8 @@ * \par Limits: * Must be a name of a module that is implemented by the PSP */ - #define HS_SYSTEM_MONITOR_DEVICE HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_DEVICE) - #define DEFAULT_HS_SYSTEM_MONITOR_DEVICE "linux_sysmon" +#define HS_SYSTEM_MONITOR_DEVICE HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_DEVICE) +#define DEFAULT_HS_SYSTEM_MONITOR_DEVICE "linux_sysmon" /** * \brief CPU Utilization subsystem name @@ -340,8 +340,8 @@ * Reverts to 0 if the name is not found. * */ - #define HS_SYSTEM_MONITOR_SUBSYSTEM_NAME HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_SUBSYSTEM_NAME) - #define DEFAULT_HS_SYSTEM_MONITOR_SUBSYSTEM_NAME "aggregate" +#define HS_SYSTEM_MONITOR_SUBSYSTEM_NAME HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_SUBSYSTEM_NAME) +#define DEFAULT_HS_SYSTEM_MONITOR_SUBSYSTEM_NAME "aggregate" /** * \brief CPU Utilization subchannel name @@ -351,8 +351,8 @@ * Reverts to 0 if the name is not found. * */ - #define HS_SYSTEM_MONITOR_SUBCHANNEL_NAME HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_SUBCHANNEL_NAME) - #define DEFAULT_HS_SYSTEM_MONITOR_SUBCHANNEL_NAME "cpu-load" +#define HS_SYSTEM_MONITOR_SUBCHANNEL_NAME HS_INTERNAL_CFGVAL(SYSTEM_MONITOR_SUBCHANNEL_NAME) +#define DEFAULT_HS_SYSTEM_MONITOR_SUBCHANNEL_NAME "cpu-load" /** * \brief CPU Utilization Cycles per Interval @@ -369,8 +369,8 @@ * underlying PSP module, otherwise the same data will be reported. * */ - #define HS_CPU_UTILIZATION_CYCLES_PER_INTERVAL HS_INTERNAL_CFGVAL(CPU_UTILIZATION_CYCLES_PER_INTERVAL) - #define DEFAULT_HS_CPU_UTILIZATION_CYCLES_PER_INTERVAL 30 +#define HS_CPU_UTILIZATION_CYCLES_PER_INTERVAL HS_INTERNAL_CFGVAL(CPU_UTILIZATION_CYCLES_PER_INTERVAL) +#define DEFAULT_HS_CPU_UTILIZATION_CYCLES_PER_INTERVAL 30 /** * \brief CPU Utilization Maximum Range @@ -383,8 +383,8 @@ * This parameter can't be larger than an unsigned 32 bit * integer (4294967295). */ - #define HS_CPU_UTILIZATION_MAX HS_INTERNAL_CFGVAL(CPU_UTILIZATION_MAX) - #define DEFAULT_HS_CPU_UTILIZATION_MAX 10000 +#define HS_CPU_UTILIZATION_MAX HS_INTERNAL_CFGVAL(CPU_UTILIZATION_MAX) +#define DEFAULT_HS_CPU_UTILIZATION_MAX 10000 /** * \brief CPU Utilization Hogging Utils Per Interval @@ -396,8 +396,8 @@ * \par Limits: * This parameter can't be larger than #HS_CPU_UTILIZATION_MAX. */ - #define HS_UTIL_PER_INTERVAL_HOGGING HS_INTERNAL_CFGVAL(UTIL_PER_INTERVAL_HOGGING) - #define DEFAULT_HS_UTIL_PER_INTERVAL_HOGGING 7500 +#define HS_UTIL_PER_INTERVAL_HOGGING HS_INTERNAL_CFGVAL(UTIL_PER_INTERVAL_HOGGING) +#define DEFAULT_HS_UTIL_PER_INTERVAL_HOGGING 7500 /** * \brief CPU Utilization Hogging Timeout @@ -410,8 +410,8 @@ * This parameter can't be larger than an unsigned 32 bit * integer (4294967295). */ - #define HS_UTIL_HOGGING_TIMEOUT HS_INTERNAL_CFGVAL(UTIL_HOGGING_TIMEOUT) - #define DEFAULT_HS_UTIL_HOGGING_TIMEOUT 5 +#define HS_UTIL_HOGGING_TIMEOUT HS_INTERNAL_CFGVAL(UTIL_HOGGING_TIMEOUT) +#define DEFAULT_HS_UTIL_HOGGING_TIMEOUT 5 /** * \brief CPU Peak Utilization Number of Intervals @@ -426,8 +426,8 @@ * This parameter controls the size of the array which stores * previously measured utilization values. */ - #define HS_UTIL_PEAK_NUM_INTERVAL HS_INTERNAL_CFGVAL(UTIL_PEAK_NUM_INTERVAL) - #define DEFAULT_HS_UTIL_PEAK_NUM_INTERVAL 64 +#define HS_UTIL_PEAK_NUM_INTERVAL HS_INTERNAL_CFGVAL(UTIL_PEAK_NUM_INTERVAL) +#define DEFAULT_HS_UTIL_PEAK_NUM_INTERVAL 64 /** * \brief CPU Average Utilization Number of Intervals @@ -438,8 +438,8 @@ * \par Limits: * This parameter can't be larger than #HS_UTIL_PEAK_NUM_INTERVAL . */ - #define HS_UTIL_AVERAGE_NUM_INTERVAL HS_INTERNAL_CFGVAL(UTIL_AVERAGE_NUM_INTERVAL) - #define DEFAULT_HS_UTIL_AVERAGE_NUM_INTERVAL 4 +#define HS_UTIL_AVERAGE_NUM_INTERVAL HS_INTERNAL_CFGVAL(UTIL_AVERAGE_NUM_INTERVAL) +#define DEFAULT_HS_UTIL_AVERAGE_NUM_INTERVAL 4 /** * \brief Mission specific version number for HS application @@ -455,8 +455,8 @@ * Must be defined as a numeric value that is greater than * or equal to zero. */ - #define HS_MISSION_REV HS_INTERNAL_CFGVAL(MISSION_REV) - #define DEFAULT_HS_MISSION_REV 0 +#define HS_MISSION_REV HS_INTERNAL_CFGVAL(MISSION_REV) +#define DEFAULT_HS_MISSION_REV 0 /**\}*/ diff --git a/fsw/inc/hs_perfids.h b/fsw/inc/hs_perfids.h index d98d7dd..6c696e1 100644 --- a/fsw/inc/hs_perfids.h +++ b/fsw/inc/hs_perfids.h @@ -28,7 +28,7 @@ * \{ */ -#define HS_APPMAIN_PERF_ID 40 /**< \brief Main task performance ID */ +#define HS_APPMAIN_PERF_ID 40 /**< \brief Main task performance ID */ /**\}*/ diff --git a/fsw/inc/hs_topicids.h b/fsw/inc/hs_topicids.h index ba32cf6..584e4b6 100644 --- a/fsw/inc/hs_topicids.h +++ b/fsw/inc/hs_topicids.h @@ -25,16 +25,16 @@ #include "hs_topicid_values.h" -#define CFE_MISSION_HS_CMD_TOPICID CFE_MISSION_HS_TIDVAL(CMD) -#define DEFAULT_CFE_MISSION_HS_CMD_TOPICID 0xAE /**< \brief Msg ID for cmds to HS */ +#define CFE_MISSION_HS_CMD_TOPICID CFE_MISSION_HS_TIDVAL(CMD) +#define DEFAULT_CFE_MISSION_HS_CMD_TOPICID 0xAE /**< \brief Msg ID for cmds to HS */ #define CFE_MISSION_HS_SEND_HK_TOPICID CFE_MISSION_HS_TIDVAL(SEND_HK) #define DEFAULT_CFE_MISSION_HS_SEND_HK_TOPICID 0xAF /**< \brief Msg ID to request HS housekeeping */ -#define CFE_MISSION_HS_WAKEUP_TOPICID CFE_MISSION_HS_TIDVAL(WAKEUP) -#define DEFAULT_CFE_MISSION_HS_WAKEUP_TOPICID 0xB0 /**< \brief Msg ID to wake up HS */ +#define CFE_MISSION_HS_WAKEUP_TOPICID CFE_MISSION_HS_TIDVAL(WAKEUP) +#define DEFAULT_CFE_MISSION_HS_WAKEUP_TOPICID 0xB0 /**< \brief Msg ID to wake up HS */ -#define CFE_MISSION_HS_HK_TLM_TOPICID CFE_MISSION_HS_TIDVAL(HK_TLM) -#define DEFAULT_CFE_MISSION_HS_HK_TLM_TOPICID 0xAD /**< \brief HS Housekeeping Telemetry */ +#define CFE_MISSION_HS_HK_TLM_TOPICID CFE_MISSION_HS_TIDVAL(HK_TLM) +#define DEFAULT_CFE_MISSION_HS_HK_TLM_TOPICID 0xAD /**< \brief HS Housekeeping Telemetry */ #endif diff --git a/fsw/src/hs_app.c b/fsw/src/hs_app.c index 082048b..55d9f65 100644 --- a/fsw/src/hs_app.c +++ b/fsw/src/hs_app.c @@ -87,12 +87,16 @@ void HS_AppMain(void) */ if (HS_AppData.CurrentEventMonState == HS_State_ENABLED) { - Status = CFE_SB_SubscribeEx(CFE_SB_ValueToMsgId(CFE_EVS_LONG_EVENT_MSG_MID), HS_AppData.EventPipe, - CFE_SB_DEFAULT_QOS, HS_EVENT_PIPE_DEPTH); + Status = CFE_SB_SubscribeEx(CFE_SB_ValueToMsgId(CFE_EVS_LONG_EVENT_MSG_MID), + HS_AppData.EventPipe, + CFE_SB_DEFAULT_QOS, + HS_EVENT_PIPE_DEPTH); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_SUB_LONG_EVS_ERR_EID, CFE_EVS_EventType_ERROR, - "Error Subscribing to long-format Events,RC=0x%08X", (unsigned int)Status); + CFE_EVS_SendEvent(HS_SUB_LONG_EVS_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Subscribing to long-format Events,RC=0x%08X", + (unsigned int)Status); /* Set run status to terminate main loop */ RunStatus = CFE_ES_RunStatus_APP_ERROR; @@ -100,12 +104,16 @@ void HS_AppMain(void) if (Status == CFE_SUCCESS) { - Status = CFE_SB_SubscribeEx(CFE_SB_ValueToMsgId(CFE_EVS_SHORT_EVENT_MSG_MID), HS_AppData.EventPipe, - CFE_SB_DEFAULT_QOS, HS_EVENT_PIPE_DEPTH); + Status = CFE_SB_SubscribeEx(CFE_SB_ValueToMsgId(CFE_EVS_SHORT_EVENT_MSG_MID), + HS_AppData.EventPipe, + CFE_SB_DEFAULT_QOS, + HS_EVENT_PIPE_DEPTH); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_SUB_SHORT_EVS_ERR_EID, CFE_EVS_EventType_ERROR, - "Error Subscribing to short-format Events,RC=0x%08X", (unsigned int)Status); + CFE_EVS_SendEvent(HS_SUB_SHORT_EVS_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Subscribing to short-format Events,RC=0x%08X", + (unsigned int)Status); /* Set run status to terminate main loop */ RunStatus = CFE_ES_RunStatus_APP_ERROR; @@ -171,7 +179,9 @@ void HS_AppMain(void) /* ** Send an event describing the reason for the termination */ - CFE_EVS_SendEvent(HS_APP_EXIT_EID, CFE_EVS_EventType_CRITICAL, "Application Terminating, err = 0x%08X", + CFE_EVS_SendEvent(HS_APP_EXIT_EID, + CFE_EVS_EventType_CRITICAL, + "Application Terminating, err = 0x%08X", (unsigned int)Status); /* @@ -247,13 +257,14 @@ CFE_Status_t HS_AppInit(void) if (Status == CFE_SUCCESS) { - if ((HS_AppData.CDSData.ResetsPerformed != (uint16)~HS_AppData.CDSData.ResetsPerformedNot) || - (HS_AppData.CDSData.MaxResets != (uint16)~HS_AppData.CDSData.MaxResetsNot)) + if ((HS_AppData.CDSData.ResetsPerformed != (uint16)~HS_AppData.CDSData.ResetsPerformedNot) + || (HS_AppData.CDSData.MaxResets != (uint16)~HS_AppData.CDSData.MaxResetsNot)) { /* ** Report error restoring data */ - CFE_EVS_SendEvent(HS_CDS_CORRUPT_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_CDS_CORRUPT_ERR_EID, + CFE_EVS_EventType_ERROR, "Data in CDS was corrupt, initializing resets data"); /* ** If data was corrupt, initialize data @@ -266,7 +277,8 @@ CFE_Status_t HS_AppInit(void) /* ** Report error restoring data */ - CFE_EVS_SendEvent(HS_CDS_RESTORE_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_CDS_RESTORE_ERR_EID, + CFE_EVS_EventType_ERROR, "Failed to restore data from CDS (Err=0x%08x), initializing resets data", (unsigned int)Status); /* @@ -321,16 +333,23 @@ CFE_Status_t HS_AppInit(void) Status = HS_SysMonInit(); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_SYSMON_INIT_ERR_EID, CFE_EVS_EventType_ERROR, - "Error in system monitor initialization, RC=0x%08X", (unsigned int)Status); + CFE_EVS_SendEvent(HS_SYSMON_INIT_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error in system monitor initialization, RC=0x%08X", + (unsigned int)Status); return Status; } /* ** Application initialization event */ - CFE_EVS_SendEvent(HS_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, "HS Initialized. Version %d.%d.%d.%d", - HS_MAJOR_VERSION, HS_MINOR_VERSION, HS_REVISION, HS_MISSION_REV); + CFE_EVS_SendEvent(HS_INIT_INF_EID, + CFE_EVS_EventType_INFORMATION, + "HS Initialized. Version %d.%d.%d.%d", + HS_MAJOR_VERSION, + HS_MINOR_VERSION, + HS_REVISION, + HS_MISSION_REV); return Status; } @@ -345,14 +364,17 @@ CFE_Status_t HS_SbInit(void) CFE_Status_t Status; /* Initialize housekeeping packet */ - CFE_MSG_Init(CFE_MSG_PTR(HS_AppData.HkPacket.TelemetryHeader), CFE_SB_ValueToMsgId(HS_HK_TLM_MID), + CFE_MSG_Init(CFE_MSG_PTR(HS_AppData.HkPacket.TelemetryHeader), + CFE_SB_ValueToMsgId(HS_HK_TLM_MID), sizeof(HS_HkPacket_t)); /* Create Command Pipe */ Status = CFE_SB_CreatePipe(&HS_AppData.CmdPipe, HS_CMD_PIPE_DEPTH, HS_CMD_PIPE_NAME); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_CR_PIPE_ERR_EID, CFE_EVS_EventType_ERROR, "Error Creating SB Command Pipe,RC=0x%08X", + CFE_EVS_SendEvent(HS_CR_PIPE_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Creating SB Command Pipe,RC=0x%08X", (unsigned int)Status); return Status; } @@ -361,7 +383,9 @@ CFE_Status_t HS_SbInit(void) Status = CFE_SB_CreatePipe(&HS_AppData.EventPipe, HS_EVENT_PIPE_DEPTH, HS_EVENT_PIPE_NAME); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_CR_EVENT_PIPE_ERR_EID, CFE_EVS_EventType_ERROR, "Error Creating SB Event Pipe,RC=0x%08X", + CFE_EVS_SendEvent(HS_CR_EVENT_PIPE_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Creating SB Event Pipe,RC=0x%08X", (unsigned int)Status); return Status; } @@ -370,7 +394,9 @@ CFE_Status_t HS_SbInit(void) Status = CFE_SB_CreatePipe(&HS_AppData.WakeupPipe, HS_WAKEUP_PIPE_DEPTH, HS_WAKEUP_PIPE_NAME); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_CR_WAKEUP_PIPE_ERR_EID, CFE_EVS_EventType_ERROR, "Error Creating SB Wakeup Pipe,RC=0x%08X", + CFE_EVS_SendEvent(HS_CR_WAKEUP_PIPE_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Creating SB Wakeup Pipe,RC=0x%08X", (unsigned int)Status); return Status; } @@ -379,7 +405,9 @@ CFE_Status_t HS_SbInit(void) Status = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(HS_SEND_HK_MID), HS_AppData.CmdPipe); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_SUB_REQ_ERR_EID, CFE_EVS_EventType_ERROR, "Error Subscribing to HK Request,RC=0x%08X", + CFE_EVS_SendEvent(HS_SUB_REQ_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Subscribing to HK Request,RC=0x%08X", (unsigned int)Status); return Status; } @@ -388,7 +416,9 @@ CFE_Status_t HS_SbInit(void) Status = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(HS_CMD_MID), HS_AppData.CmdPipe); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_SUB_CMD_ERR_EID, CFE_EVS_EventType_ERROR, "Error Subscribing to Gnd Cmds,RC=0x%08X", + CFE_EVS_SendEvent(HS_SUB_CMD_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Subscribing to Gnd Cmds,RC=0x%08X", (unsigned int)Status); return Status; } @@ -397,7 +427,9 @@ CFE_Status_t HS_SbInit(void) Status = CFE_SB_Subscribe(CFE_SB_ValueToMsgId(HS_WAKEUP_MID), HS_AppData.WakeupPipe); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_SUB_WAKEUP_ERR_EID, CFE_EVS_EventType_ERROR, "Error Subscribing to Wakeup,RC=0x%08X", + CFE_EVS_SendEvent(HS_SUB_WAKEUP_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Subscribing to Wakeup,RC=0x%08X", (unsigned int)Status); return Status; } @@ -422,48 +454,68 @@ CFE_Status_t HS_TblInit(void) /* Register The HS Applications Monitor Table */ TableSize = HS_MAX_MONITORED_APPS * sizeof(HS_AMTEntry_t); - Status = CFE_TBL_Register(&HS_AppData.AMTableHandle, HS_AMT_TABLENAME, TableSize, CFE_TBL_OPT_DEFAULT, + Status = CFE_TBL_Register(&HS_AppData.AMTableHandle, + HS_AMT_TABLENAME, + TableSize, + CFE_TBL_OPT_DEFAULT, HS_ValidateAMTable); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_AMT_REG_ERR_EID, CFE_EVS_EventType_ERROR, "Error Registering AppMon Table,RC=0x%08X", + CFE_EVS_SendEvent(HS_AMT_REG_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Registering AppMon Table,RC=0x%08X", (unsigned int)Status); return Status; } /* Register The HS Events Monitor Table */ TableSize = HS_MAX_MONITORED_EVENTS * sizeof(HS_EMTEntry_t); - Status = CFE_TBL_Register(&HS_AppData.EMTableHandle, HS_EMT_TABLENAME, TableSize, CFE_TBL_OPT_DEFAULT, + Status = CFE_TBL_Register(&HS_AppData.EMTableHandle, + HS_EMT_TABLENAME, + TableSize, + CFE_TBL_OPT_DEFAULT, HS_ValidateEMTable); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_EMT_REG_ERR_EID, CFE_EVS_EventType_ERROR, "Error Registering EventMon Table,RC=0x%08X", + CFE_EVS_SendEvent(HS_EMT_REG_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Registering EventMon Table,RC=0x%08X", (unsigned int)Status); return Status; } /* Register The HS Message Actions Table */ TableSize = HS_MAX_MSG_ACT_TYPES * sizeof(HS_MATEntry_t); - Status = CFE_TBL_Register(&HS_AppData.MATableHandle, HS_MAT_TABLENAME, TableSize, CFE_TBL_OPT_DEFAULT, + Status = CFE_TBL_Register(&HS_AppData.MATableHandle, + HS_MAT_TABLENAME, + TableSize, + CFE_TBL_OPT_DEFAULT, HS_ValidateMATable); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_MAT_REG_ERR_EID, CFE_EVS_EventType_ERROR, "Error Registering MsgActs Table,RC=0x%08X", + CFE_EVS_SendEvent(HS_MAT_REG_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Registering MsgActs Table,RC=0x%08X", (unsigned int)Status); return Status; } /* Register The HS Execution Counters Table */ TableSize = HS_MAX_EXEC_CNT_SLOTS * sizeof(HS_XCTEntry_t); - Status = CFE_TBL_Register(&HS_AppData.XCTableHandle, HS_XCT_TABLENAME, TableSize, CFE_TBL_OPT_DEFAULT, + Status = CFE_TBL_Register(&HS_AppData.XCTableHandle, + HS_XCT_TABLENAME, + TableSize, + CFE_TBL_OPT_DEFAULT, HS_ValidateXCTable); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_XCT_REG_ERR_EID, CFE_EVS_EventType_ERROR, "Error Registering ExeCount Table,RC=0x%08X", + CFE_EVS_SendEvent(HS_XCT_REG_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Registering ExeCount Table,RC=0x%08X", (unsigned int)Status); return Status; } @@ -472,7 +524,9 @@ CFE_Status_t HS_TblInit(void) Status = CFE_TBL_Load(HS_AppData.XCTableHandle, CFE_TBL_SRC_FILE, (const void *)HS_XCT_FILENAME); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_XCT_LD_ERR_EID, CFE_EVS_EventType_ERROR, "Error Loading ExeCount Table,RC=0x%08X", + CFE_EVS_SendEvent(HS_XCT_LD_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Loading ExeCount Table,RC=0x%08X", (unsigned int)Status); HS_AppData.ExeCountState = HS_State_DISABLED; for (TableIndex = 0; TableIndex < HS_MAX_EXEC_CNT_SLOTS; TableIndex++) @@ -486,10 +540,13 @@ CFE_Status_t HS_TblInit(void) Status = CFE_TBL_Load(HS_AppData.AMTableHandle, CFE_TBL_SRC_FILE, (const void *)HS_AMT_FILENAME); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_AMT_LD_ERR_EID, CFE_EVS_EventType_ERROR, "Error Loading AppMon Table,RC=0x%08X", + CFE_EVS_SendEvent(HS_AMT_LD_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Loading AppMon Table,RC=0x%08X", (unsigned int)Status); HS_AppData.CurrentAppMonState = HS_State_DISABLED; - CFE_EVS_SendEvent(HS_DISABLE_APPMON_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_DISABLE_APPMON_ERR_EID, + CFE_EVS_EventType_ERROR, "Application Monitoring Disabled due to Table Load Failure"); HS_AppData.AppMonLoaded = HS_State_DISABLED; } @@ -498,10 +555,13 @@ CFE_Status_t HS_TblInit(void) Status = CFE_TBL_Load(HS_AppData.EMTableHandle, CFE_TBL_SRC_FILE, (const void *)HS_EMT_FILENAME); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_EMT_LD_ERR_EID, CFE_EVS_EventType_ERROR, "Error Loading EventMon Table,RC=0x%08X", + CFE_EVS_SendEvent(HS_EMT_LD_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Loading EventMon Table,RC=0x%08X", (unsigned int)Status); HS_AppData.CurrentEventMonState = HS_State_DISABLED; - CFE_EVS_SendEvent(HS_DISABLE_EVENTMON_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_DISABLE_EVENTMON_ERR_EID, + CFE_EVS_EventType_ERROR, "Event Monitoring Disabled due to Table Load Failure"); HS_AppData.EventMonLoaded = HS_State_DISABLED; } @@ -510,7 +570,9 @@ CFE_Status_t HS_TblInit(void) Status = CFE_TBL_Load(HS_AppData.MATableHandle, CFE_TBL_SRC_FILE, (const void *)HS_MAT_FILENAME); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_MAT_LD_ERR_EID, CFE_EVS_EventType_ERROR, "Error Loading MsgActs Table,RC=0x%08X", + CFE_EVS_SendEvent(HS_MAT_LD_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error Loading MsgActs Table,RC=0x%08X", (unsigned int)Status); HS_AppData.MsgActsState = HS_State_DISABLED; } @@ -531,7 +593,7 @@ CFE_Status_t HS_TblInit(void) CFE_Status_t HS_ProcessMain(void) { CFE_Status_t Status = CFE_SUCCESS; - const char * AliveString = HS_CPU_ALIVE_STRING; + const char *AliveString = HS_CPU_ALIVE_STRING; uint32 i = 0; /* diff --git a/fsw/src/hs_app.h b/fsw/src/hs_app.h index 2d7163a..ca9ef5a 100644 --- a/fsw/src/hs_app.h +++ b/fsw/src/hs_app.h @@ -73,7 +73,6 @@ #define HS_MAT_TABLENAME "MsgActs_Tbl" /**< \brief MsgAction Table Name */ /**\}*/ - /************************************************************************ * Type Definitions ************************************************************************/ @@ -121,8 +120,8 @@ typedef struct uint16 MsgActCooldown[HS_MAX_MSG_ACT_TYPES]; /**< \brief Counts until Message Actions is available */ uint16 AppMonCheckInCountdown[HS_MAX_MONITORED_APPS]; /**< \brief Counts until Application Monitor times out */ - uint32 AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) + - 1]; /**< \brief AppMon state by monitor */ + uint32 AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) + + 1]; /**< \brief AppMon state by monitor */ uint32 AppMonLastExeCount[HS_MAX_MONITORED_APPS]; /**< \brief Last Execution Count for application being checked */ @@ -152,7 +151,7 @@ typedef struct CFE_TBL_Handle_t MATableHandle; /**< \brief Message Actions table handle */ CFE_TBL_Handle_t XCTableHandle; /**< \brief Execution Counters table handle */ - HS_XCTEntry_t * XCTablePtr; /**< \brief Ptr to Execution Counters table entry */ + HS_XCTEntry_t *XCTablePtr; /**< \brief Ptr to Execution Counters table entry */ HS_AMTEntry_t *AMTablePtr; /**< \brief Ptr to Apps Monitor table entry */ HS_EMTEntry_t *EMTablePtr; /**< \brief Ptr to Events Monitor table entry */ diff --git a/fsw/src/hs_cmds.c b/fsw/src/hs_cmds.c index c92415f..8eecd64 100644 --- a/fsw/src/hs_cmds.c +++ b/fsw/src/hs_cmds.c @@ -80,16 +80,18 @@ CFE_Status_t HS_SendHkCmd(const HS_SendHkCmd_t *BufPtr) ** Calculate the current number of invalid event monitor entries */ PayloadPtr->InvalidEventMonCount = 0; - - for (TableIndex = 0; TableIndex < HS_MAX_MONITORED_EVENTS; TableIndex++) + if (HS_AppData.EMTablePtr != NULL) { - if (HS_AppData.EMTablePtr[TableIndex].ActionType != HS_EMTActType_NOACT) + for (TableIndex = 0; TableIndex < HS_MAX_MONITORED_EVENTS; TableIndex++) { - Status = CFE_ES_GetAppIDByName(&AppId, HS_AppData.EMTablePtr[TableIndex].AppName); - - if (Status != CFE_SUCCESS) + if (HS_AppData.EMTablePtr[TableIndex].ActionType != HS_EMTActType_NOACT) { - PayloadPtr->InvalidEventMonCount++; + Status = CFE_ES_GetAppIDByName(&AppId, HS_AppData.EMTablePtr[TableIndex].AppName); + + if (Status != CFE_SUCCESS) + { + PayloadPtr->InvalidEventMonCount++; + } } } } @@ -137,7 +139,7 @@ CFE_Status_t HS_SendHkCmd(const HS_SendHkCmd_t *BufPtr) { ExeCount = HS_INVALID_EXECOUNT; - if (HS_AppData.ExeCountState == HS_State_ENABLED) + if ((HS_AppData.ExeCountState == HS_State_ENABLED) && (HS_AppData.XCTablePtr != NULL)) { switch (HS_AppData.XCTablePtr[TableIndex].ResourceType) { @@ -168,12 +170,13 @@ CFE_Status_t HS_SendHkCmd(const HS_SendHkCmd_t *BufPtr) break; default: /* ExeCount remains HS_INVALID_EXECOUNT */ - CFE_EVS_SendEvent(HS_HKREQ_RESOURCE_DBG_EID, CFE_EVS_EventType_DEBUG, + CFE_EVS_SendEvent(HS_HKREQ_RESOURCE_DBG_EID, + CFE_EVS_EventType_DEBUG, "Housekeeping req found unknown resource. Type=0x%08X", (unsigned int)HS_AppData.XCTablePtr[TableIndex].ResourceType); break; } /* end ResourceType switch statement */ - } /* end ExeCountState if statement */ + } /* end ExeCountState if statement */ PayloadPtr->ExeCounts[TableIndex] = ExeCount; } @@ -196,8 +199,13 @@ CFE_Status_t HS_NoopCmd(const HS_NoopCmd_t *BufPtr) { HS_AppData.CmdCount++; - CFE_EVS_SendEvent(HS_NOOP_INF_EID, CFE_EVS_EventType_INFORMATION, "No-op command: Version %d.%d.%d.%d", - HS_MAJOR_VERSION, HS_MINOR_VERSION, HS_REVISION, HS_MISSION_REV); + CFE_EVS_SendEvent(HS_NOOP_INF_EID, + CFE_EVS_EventType_INFORMATION, + "No-op command: Version %d.%d.%d.%d", + HS_MAJOR_VERSION, + HS_MINOR_VERSION, + HS_REVISION, + HS_MISSION_REV); return CFE_SUCCESS; } @@ -211,8 +219,7 @@ CFE_Status_t HS_ResetCmd(const HS_ResetCmd_t *BufPtr) { HS_ResetCounters(); - CFE_EVS_SendEvent(HS_RESET_INF_EID, CFE_EVS_EventType_INFORMATION, - "Reset counters command"); + CFE_EVS_SendEvent(HS_RESET_INF_EID, CFE_EVS_EventType_INFORMATION, "Reset counters command"); return CFE_SUCCESS; } @@ -240,7 +247,8 @@ CFE_Status_t HS_EnableAppMonCmd(const HS_EnableAppMonCmd_t *BufPtr) if (HS_AppData.CurrentAppMonState == HS_State_ENABLED) { - CFE_EVS_SendEvent(HS_ENABLE_APPMON_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(HS_ENABLE_APPMON_INF_EID, + CFE_EVS_EventType_INFORMATION, "Application Monitoring is *already* Enabled"); } else @@ -264,7 +272,8 @@ CFE_Status_t HS_DisableAppMonCmd(const HS_DisableAppMonCmd_t *BufPtr) if (HS_AppData.CurrentAppMonState == HS_State_DISABLED) { - CFE_EVS_SendEvent(HS_DISABLE_APPMON_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(HS_DISABLE_APPMON_INF_EID, + CFE_EVS_EventType_INFORMATION, "Application Monitoring is *already* Disabled"); } else @@ -287,34 +296,42 @@ CFE_Status_t HS_EnableEventMonCmd(const HS_EnableEventMonCmd_t *BufPtr) if (HS_AppData.CurrentEventMonState == HS_State_ENABLED) { - CFE_EVS_SendEvent(HS_ENABLE_EVENTMON_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(HS_ENABLE_EVENTMON_INF_EID, + CFE_EVS_EventType_INFORMATION, "Event Monitoring is *already* Enabled"); } else { - Status = CFE_SB_SubscribeEx(CFE_SB_ValueToMsgId(CFE_EVS_LONG_EVENT_MSG_MID), HS_AppData.EventPipe, - CFE_SB_DEFAULT_QOS, HS_EVENT_PIPE_DEPTH); + Status = CFE_SB_SubscribeEx(CFE_SB_ValueToMsgId(CFE_EVS_LONG_EVENT_MSG_MID), + HS_AppData.EventPipe, + CFE_SB_DEFAULT_QOS, + HS_EVENT_PIPE_DEPTH); if (Status == CFE_SUCCESS) { - Status = CFE_SB_SubscribeEx(CFE_SB_ValueToMsgId(CFE_EVS_SHORT_EVENT_MSG_MID), HS_AppData.EventPipe, - CFE_SB_DEFAULT_QOS, HS_EVENT_PIPE_DEPTH); + Status = CFE_SB_SubscribeEx(CFE_SB_ValueToMsgId(CFE_EVS_SHORT_EVENT_MSG_MID), + HS_AppData.EventPipe, + CFE_SB_DEFAULT_QOS, + HS_EVENT_PIPE_DEPTH); if (Status == CFE_SUCCESS) { HS_AppData.CurrentEventMonState = HS_State_ENABLED; - CFE_EVS_SendEvent(HS_ENABLE_EVENTMON_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(HS_ENABLE_EVENTMON_INF_EID, + CFE_EVS_EventType_INFORMATION, "Event Monitoring Enabled"); } else { - CFE_EVS_SendEvent(HS_EVENTMON_SHORT_SUB_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EVENTMON_SHORT_SUB_EID, + CFE_EVS_EventType_ERROR, "Event Monitor Enable: Error Subscribing to short-format Events,RC=0x%08X", (unsigned int)Status); } } else { - CFE_EVS_SendEvent(HS_EVENTMON_LONG_SUB_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EVENTMON_LONG_SUB_EID, + CFE_EVS_EventType_ERROR, "Event Monitor Enable: Error Subscribing to long-format Events,RC=0x%08X", (unsigned int)Status); } @@ -343,7 +360,8 @@ CFE_Status_t HS_DisableEventMonCmd(const HS_DisableEventMonCmd_t *BufPtr) if (HS_AppData.CurrentEventMonState == HS_State_DISABLED) { - CFE_EVS_SendEvent(HS_DISABLE_EVENTMON_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(HS_DISABLE_EVENTMON_INF_EID, + CFE_EVS_EventType_INFORMATION, "Event Monitoring is *already* Disabled"); } else @@ -357,19 +375,22 @@ CFE_Status_t HS_DisableEventMonCmd(const HS_DisableEventMonCmd_t *BufPtr) if (Status == CFE_SUCCESS) { HS_AppData.CurrentEventMonState = HS_State_DISABLED; - CFE_EVS_SendEvent(HS_DISABLE_EVENTMON_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(HS_DISABLE_EVENTMON_INF_EID, + CFE_EVS_EventType_INFORMATION, "Event Monitoring Disabled"); } else { - CFE_EVS_SendEvent(HS_EVENTMON_SHORT_UNSUB_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EVENTMON_SHORT_UNSUB_EID, + CFE_EVS_EventType_ERROR, "Event Monitor Disable: Error Unsubscribing from short-format Events,RC=0x%08X", (unsigned int)Status); } } else { - CFE_EVS_SendEvent(HS_EVENTMON_LONG_UNSUB_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EVENTMON_LONG_UNSUB_EID, + CFE_EVS_EventType_ERROR, "Event Monitor Disable: Error Unsubscribing from long-format Events,RC=0x%08X", (unsigned int)Status); } @@ -398,7 +419,8 @@ CFE_Status_t HS_EnableAlivenessCmd(const HS_EnableAlivenessCmd_t *BufPtr) if (HS_AppData.CurrentAlivenessState == HS_State_ENABLED) { - CFE_EVS_SendEvent(HS_ENABLE_ALIVENESS_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(HS_ENABLE_ALIVENESS_INF_EID, + CFE_EVS_EventType_INFORMATION, "Aliveness Indicator is *already* Enabled"); } else @@ -421,7 +443,8 @@ CFE_Status_t HS_DisableAlivenessCmd(const HS_DisableAlivenessCmd_t *BufPtr) if (HS_AppData.CurrentAlivenessState == HS_State_DISABLED) { - CFE_EVS_SendEvent(HS_DISABLE_ALIVENESS_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(HS_DISABLE_ALIVENESS_INF_EID, + CFE_EVS_EventType_INFORMATION, "Aliveness Indicator is *already* Disabled"); } else @@ -444,7 +467,8 @@ CFE_Status_t HS_EnableCpuHogCmd(const HS_EnableCpuHogCmd_t *BufPtr) if (HS_AppData.CurrentCPUHogState == HS_State_ENABLED) { - CFE_EVS_SendEvent(HS_ENABLE_CPUHOG_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(HS_ENABLE_CPUHOG_INF_EID, + CFE_EVS_EventType_INFORMATION, "CPU Hogging Indicator is *already* Enabled"); } else @@ -467,7 +491,8 @@ CFE_Status_t HS_DisableCpuHogCmd(const HS_DisableCpuHogCmd_t *BufPtr) if (HS_AppData.CurrentCPUHogState == HS_State_DISABLED) { - CFE_EVS_SendEvent(HS_DISABLE_CPUHOG_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(HS_DISABLE_CPUHOG_INF_EID, + CFE_EVS_EventType_INFORMATION, "CPU Hogging Indicator is *already* Disabled"); } else @@ -488,7 +513,8 @@ CFE_Status_t HS_ResetResetsPerformedCmd(const HS_ResetResetsPerformedCmd_t *BufP { HS_AppData.CmdCount++; HS_SetCDSData(0, HS_AppData.CDSData.MaxResets); - CFE_EVS_SendEvent(HS_RESET_RESETS_INF_EID, CFE_EVS_EventType_INFORMATION, + CFE_EVS_SendEvent(HS_RESET_RESETS_INF_EID, + CFE_EVS_EventType_INFORMATION, "Processor Resets Performed by HS Counter has been Reset"); return CFE_SUCCESS; @@ -508,8 +534,10 @@ CFE_Status_t HS_SetMaxResetsCmd(const HS_SetMaxResetsCmd_t *BufPtr) HS_SetCDSData(HS_AppData.CDSData.ResetsPerformed, CmdPtr->MaxResets); - CFE_EVS_SendEvent(HS_SET_MAX_RESETS_INF_EID, CFE_EVS_EventType_INFORMATION, - "Max Resets Performable by HS has been set to %d", HS_AppData.CDSData.MaxResets); + CFE_EVS_SendEvent(HS_SET_MAX_RESETS_INF_EID, + CFE_EVS_EventType_INFORMATION, + "Max Resets Performable by HS has been set to %d", + HS_AppData.CDSData.MaxResets); return CFE_SUCCESS; } @@ -556,7 +584,8 @@ void HS_AcquirePointers(void) */ if ((HS_AppData.AppMonLoaded == HS_State_ENABLED) || (HS_AppData.CurrentAppMonState == HS_State_ENABLED)) { - CFE_EVS_SendEvent(HS_APPMON_GETADDR_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_APPMON_GETADDR_ERR_EID, + CFE_EVS_EventType_ERROR, "Error getting AppMon Table address, RC=0x%08X, Application Monitoring Disabled", (unsigned int)Status); HS_AppData.CurrentAppMonState = HS_State_DISABLED; @@ -596,7 +625,8 @@ void HS_AcquirePointers(void) */ if ((HS_AppData.EventMonLoaded == HS_State_ENABLED) || (HS_AppData.CurrentEventMonState == HS_State_ENABLED)) { - CFE_EVS_SendEvent(HS_EVENTMON_GETADDR_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EVENTMON_GETADDR_ERR_EID, + CFE_EVS_EventType_ERROR, "Error getting EventMon Table address, RC=0x%08X, Event Monitoring Disabled", (unsigned int)Status); @@ -606,16 +636,20 @@ void HS_AcquirePointers(void) if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_BADEMT_LONG_UNSUB_EID, CFE_EVS_EventType_ERROR, - "Error Unsubscribing from long-format Events,RC=0x%08X", (unsigned int)Status); + CFE_EVS_SendEvent(HS_BADEMT_LONG_UNSUB_EID, + CFE_EVS_EventType_ERROR, + "Error Unsubscribing from long-format Events,RC=0x%08X", + (unsigned int)Status); } Status = CFE_SB_Unsubscribe(CFE_SB_ValueToMsgId(CFE_EVS_SHORT_EVENT_MSG_MID), HS_AppData.EventPipe); if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_BADEMT_SHORT_UNSUB_EID, CFE_EVS_EventType_ERROR, - "Error Unsubscribing from short-format Events,RC=0x%08X", (unsigned int)Status); + CFE_EVS_SendEvent(HS_BADEMT_SHORT_UNSUB_EID, + CFE_EVS_EventType_ERROR, + "Error Unsubscribing from short-format Events,RC=0x%08X", + (unsigned int)Status); } } @@ -664,8 +698,10 @@ void HS_AcquirePointers(void) */ if (HS_AppData.MsgActsState == HS_State_ENABLED) { - CFE_EVS_SendEvent(HS_MSGACTS_GETADDR_ERR_EID, CFE_EVS_EventType_ERROR, - "Error getting MsgActs Table address, RC=0x%08X", (unsigned int)Status); + CFE_EVS_SendEvent(HS_MSGACTS_GETADDR_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error getting MsgActs Table address, RC=0x%08X", + (unsigned int)Status); HS_AppData.MsgActsState = HS_State_DISABLED; } } @@ -702,8 +738,10 @@ void HS_AcquirePointers(void) */ if (HS_AppData.ExeCountState == HS_State_ENABLED) { - CFE_EVS_SendEvent(HS_EXECOUNT_GETADDR_ERR_EID, CFE_EVS_EventType_ERROR, - "Error getting ExeCount Table address, RC=0x%08X", (unsigned int)Status); + CFE_EVS_SendEvent(HS_EXECOUNT_GETADDR_ERR_EID, + CFE_EVS_EventType_ERROR, + "Error getting ExeCount Table address, RC=0x%08X", + (unsigned int)Status); HS_AppData.ExeCountState = HS_State_DISABLED; } } @@ -741,8 +779,8 @@ void HS_AppMonStatusRefresh(void) { HS_AppData.AppMonLastExeCount[TableIndex] = 0; - if ((HS_AppData.AMTablePtr[TableIndex].CycleCount == 0) || - (HS_AppData.AMTablePtr[TableIndex].ActionType == HS_AMTActType_NOACT)) + if ((HS_AppData.AMTablePtr[TableIndex].CycleCount == 0) + || (HS_AppData.AMTablePtr[TableIndex].ActionType == HS_AMTActType_NOACT)) { HS_AppData.AppMonCheckInCountdown[TableIndex] = 0; } diff --git a/fsw/src/hs_dispatch.c b/fsw/src/hs_dispatch.c index 627b877..741128b 100644 --- a/fsw/src/hs_dispatch.c +++ b/fsw/src/hs_dispatch.c @@ -60,9 +60,12 @@ bool HS_VerifyMsgLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) ** For a bad HK request, just send the event. We only increment ** the error counter for ground commands and not internal messages. */ - CFE_EVS_SendEvent(HS_HKREQ_LEN_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_HKREQ_LEN_ERR_EID, + CFE_EVS_EventType_ERROR, "Invalid HK request msg length: ID = 0x%08lX, CC = %d, Len = %d, Expected = %d", - (unsigned long)CFE_SB_MsgIdToValue(MessageID), (int)CommandCode, (int)ActualLength, + (unsigned long)CFE_SB_MsgIdToValue(MessageID), + (int)CommandCode, + (int)ActualLength, (int)ExpectedLength); } else @@ -70,9 +73,12 @@ bool HS_VerifyMsgLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) /* ** All other cases, increment error counter */ - CFE_EVS_SendEvent(HS_CMD_LEN_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_CMD_LEN_ERR_EID, + CFE_EVS_EventType_ERROR, "Invalid msg length: ID = 0x%08lX, CC = %d, Len = %d, Expected = %d", - (unsigned long)CFE_SB_MsgIdToValue(MessageID), (int)CommandCode, (int)ActualLength, + (unsigned long)CFE_SB_MsgIdToValue(MessageID), + (int)CommandCode, + (int)ActualLength, (int)ExpectedLength); HS_AppData.CmdErrCount++; } @@ -85,103 +91,125 @@ bool HS_VerifyMsgLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ -/* Process a command pipe message */ +/* Process ground commands */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void HS_AppPipe(const CFE_SB_Buffer_t *BufPtr) +void HS_AppProcessGroundCmd(const CFE_SB_Buffer_t *BufPtr) { + CFE_SB_MsgId_t MessageID = CFE_SB_INVALID_MSG_ID; /* Init to invalid value */ CFE_MSG_FcnCode_t CommandCode = 0; - CFE_SB_MsgId_t MessageID = CFE_SB_INVALID_MSG_ID; - CFE_MSG_GetMsgId(&BufPtr->Msg, &MessageID); + CFE_MSG_GetFcnCode(&BufPtr->Msg, &CommandCode); - switch (CFE_SB_MsgIdToValue(MessageID)) + switch (CommandCode) { - /* - ** Housekeeping telemetry request - */ - case HS_SEND_HK_MID: - HS_SendHkVerifyDispatch(BufPtr); + case HS_NOOP_CC: + HS_NoopVerifyDispatch(BufPtr); break; - /* - ** HS application commands... - */ - case HS_CMD_MID: + case HS_RESET_CC: + HS_ResetVerifyDispatch(BufPtr); + break; - CFE_MSG_GetFcnCode(&BufPtr->Msg, &CommandCode); + case HS_ENABLE_APP_MON_CC: + HS_EnableAppMonVerifyDispatch(BufPtr); + break; - switch (CommandCode) - { - case HS_NOOP_CC: - HS_NoopVerifyDispatch(BufPtr); - break; + case HS_DISABLE_APP_MON_CC: + HS_DisableAppMonVerifyDispatch(BufPtr); + break; - case HS_RESET_CC: - HS_ResetVerifyDispatch(BufPtr); - break; + case HS_ENABLE_EVENT_MON_CC: + HS_EnableEventMonVerifyDispatch(BufPtr); + break; - case HS_ENABLE_APP_MON_CC: - HS_EnableAppMonVerifyDispatch(BufPtr); - break; + case HS_DISABLE_EVENT_MON_CC: + HS_DisableEventMonVerifyDispatch(BufPtr); + break; - case HS_DISABLE_APP_MON_CC: - HS_DisableAppMonVerifyDispatch(BufPtr); - break; + case HS_ENABLE_ALIVENESS_CC: + HS_EnableAlivenessVerifyDispatch(BufPtr); + break; - case HS_ENABLE_EVENT_MON_CC: - HS_EnableEventMonVerifyDispatch(BufPtr); - break; + case HS_DISABLE_ALIVENESS_CC: + HS_DisableAlivenessVerifyDispatch(BufPtr); + break; - case HS_DISABLE_EVENT_MON_CC: - HS_DisableEventMonVerifyDispatch(BufPtr); - break; + case HS_RESET_RESETS_PERFORMED_CC: + HS_ResetResetsPerformedVerifyDispatch(BufPtr); + break; - case HS_ENABLE_ALIVENESS_CC: - HS_EnableAlivenessVerifyDispatch(BufPtr); - break; + case HS_SET_MAX_RESETS_CC: + HS_SetMaxResetsVerifyDispatch(BufPtr); + break; - case HS_DISABLE_ALIVENESS_CC: - HS_DisableAlivenessVerifyDispatch(BufPtr); - break; + case HS_ENABLE_CPU_HOG_CC: + HS_EnableCpuHogVerifyDispatch(BufPtr); + break; - case HS_RESET_RESETS_PERFORMED_CC: - HS_ResetResetsPerformedVerifyDispatch(BufPtr); - break; + case HS_DISABLE_CPU_HOG_CC: + HS_DisableCpuHogVerifyDispatch(BufPtr); + break; - case HS_SET_MAX_RESETS_CC: - HS_SetMaxResetsVerifyDispatch(BufPtr); - break; + default: + CFE_EVS_SendEvent(HS_CC_ERR_EID, + CFE_EVS_EventType_ERROR, + "Invalid command code: ID = 0x%08lX, CC = %d", + (unsigned long)CFE_SB_MsgIdToValue(MessageID), + CommandCode); - case HS_ENABLE_CPU_HOG_CC: - HS_EnableCpuHogVerifyDispatch(BufPtr); - break; + HS_AppData.CmdErrCount++; + break; - case HS_DISABLE_CPU_HOG_CC: - HS_DisableCpuHogVerifyDispatch(BufPtr); - break; + } /* end CommandCode switch */ +} - default: - CFE_EVS_SendEvent(HS_CC_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid command code: ID = 0x%08lX, CC = %d", - (unsigned long)CFE_SB_MsgIdToValue(MessageID), CommandCode); +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Process a command pipe message */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +void HS_AppPipe(const CFE_SB_Buffer_t *BufPtr) +{ + static CFE_SB_MsgId_t CMD_MID = CFE_SB_MSGID_RESERVED; + static CFE_SB_MsgId_t SEND_HK_MID = CFE_SB_MSGID_RESERVED; - HS_AppData.CmdErrCount++; - break; + CFE_SB_MsgId_t MessageID = CFE_SB_INVALID_MSG_ID; - } /* end CommandCode switch */ - break; + /* cache the local MID Values here, this avoids repeat lookups */ + if (!CFE_SB_IsValidMsgId(CMD_MID)) + { + CMD_MID = CFE_SB_ValueToMsgId(HS_CMD_MID); + SEND_HK_MID = CFE_SB_ValueToMsgId(HS_SEND_HK_MID); + } + + CFE_MSG_GetMsgId(&BufPtr->Msg, &MessageID); + if (CFE_SB_MsgId_Equal(MessageID, SEND_HK_MID)) + { + /* + ** Housekeeping telemetry request + */ + HS_SendHkVerifyDispatch(BufPtr); + } + else if (CFE_SB_MsgId_Equal(MessageID, CMD_MID)) + { + /* + ** HS application commands... + */ + HS_AppProcessGroundCmd(BufPtr); + } + else + { /* ** Unrecognized Message ID */ - default: - HS_AppData.CmdErrCount++; - CFE_EVS_SendEvent(HS_MID_ERR_EID, CFE_EVS_EventType_ERROR, "Invalid command pipe message ID: 0x%08lX", - (unsigned long)CFE_SB_MsgIdToValue(MessageID)); - break; - - } /* end MessageID switch */ + HS_AppData.CmdErrCount++; + CFE_EVS_SendEvent(HS_MID_ERR_EID, + CFE_EVS_EventType_ERROR, + "Invalid command pipe message ID: 0x%08lX", + (unsigned long)CFE_SB_MsgIdToValue(MessageID)); + } /* end MessageID if */ } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/fsw/src/hs_eds_dispatch.c b/fsw/src/hs_eds_dispatch.c index 69f607a..fd646f1 100644 --- a/fsw/src/hs_eds_dispatch.c +++ b/fsw/src/hs_eds_dispatch.c @@ -87,7 +87,9 @@ void HS_AppPipe(const CFE_SB_Buffer_t *BufPtr) if (Status == CFE_STATUS_UNKNOWN_MSG_ID) { - CFE_EVS_SendEvent(HS_MID_ERR_EID, CFE_EVS_EventType_ERROR, "Invalid command pipe message ID: 0x%08lX", + CFE_EVS_SendEvent(HS_MID_ERR_EID, + CFE_EVS_EventType_ERROR, + "Invalid command pipe message ID: 0x%08lX", (unsigned long)CFE_SB_MsgIdToValue(MsgId)); HS_AppData.CmdErrCount++; } @@ -99,25 +101,34 @@ void HS_AppPipe(const CFE_SB_Buffer_t *BufPtr) ** For a bad HK request, just send the event. We only increment ** the error counter for ground commands and not internal messages. */ - CFE_EVS_SendEvent(HS_HKREQ_LEN_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_HKREQ_LEN_ERR_EID, + CFE_EVS_EventType_ERROR, "Invalid HK request msg length: ID = 0x%08lX, CC = %d, Len = %d", - (unsigned long)CFE_SB_MsgIdToValue(MsgId), (int)MsgFc, (int)MsgSize); + (unsigned long)CFE_SB_MsgIdToValue(MsgId), + (int)MsgFc, + (int)MsgSize); } else { /* ** All other cases, increment error counter */ - CFE_EVS_SendEvent(HS_CMD_LEN_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_CMD_LEN_ERR_EID, + CFE_EVS_EventType_ERROR, "Invalid msg length: ID = 0x%08lX, CC = %d, Len = %d", - (unsigned long)CFE_SB_MsgIdToValue(MsgId), (int)MsgFc, (int)MsgSize); + (unsigned long)CFE_SB_MsgIdToValue(MsgId), + (int)MsgFc, + (int)MsgSize); HS_AppData.CmdErrCount++; } } else { - CFE_EVS_SendEvent(HS_CC_ERR_EID, CFE_EVS_EventType_ERROR, "Invalid command code: ID = 0x%08lX, CC = %d", - (unsigned long)CFE_SB_MsgIdToValue(MsgId), (int)MsgFc); + CFE_EVS_SendEvent(HS_CC_ERR_EID, + CFE_EVS_EventType_ERROR, + "Invalid command code: ID = 0x%08lX, CC = %d", + (unsigned long)CFE_SB_MsgIdToValue(MsgId), + (int)MsgFc); HS_AppData.CmdErrCount++; } } diff --git a/fsw/src/hs_monitors.c b/fsw/src/hs_monitors.c index 1cd1a64..c6babfe 100644 --- a/fsw/src/hs_monitors.c +++ b/fsw/src/hs_monitors.c @@ -49,6 +49,12 @@ void HS_MonitorApplications(void) uint16 ActionType; uint32 MsgActsIndex = 0; + /* Avoid accessing AMT if table pointer is invalid */ + if (HS_AppData.AMTablePtr == NULL) + { + return; + } + memset(&AppInfo, 0, sizeof(AppInfo)); for (TableIndex = 0; TableIndex < HS_MAX_MONITORED_APPS; TableIndex++) @@ -71,14 +77,16 @@ void HS_MonitorApplications(void) /* ** Only send an error event the first time the App fails to resolve */ - CFE_EVS_SendEvent(HS_APPMON_APPNAME_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_APPMON_APPNAME_ERR_EID, + CFE_EVS_EventType_ERROR, "App Monitor App Name not found: APP:(%s)", HS_AppData.AMTablePtr[TableIndex].AppName); } else { /* For repeated errors, send a debug event */ - CFE_EVS_SendEvent(HS_APPMON_APPNAME_DBG_EID, CFE_EVS_EventType_DEBUG, + CFE_EVS_SendEvent(HS_APPMON_APPNAME_DBG_EID, + CFE_EVS_EventType_DEBUG, "App Monitor App Name not found: APP:(%s)", HS_AppData.AMTablePtr[TableIndex].AppName); } @@ -111,7 +119,8 @@ void HS_MonitorApplications(void) switch (ActionType) { case HS_AMTActType_PROC_RESET: - CFE_EVS_SendEvent(HS_APPMON_PROC_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_APPMON_PROC_ERR_EID, + CFE_EVS_EventType_ERROR, "App Monitor Failure: APP:(%s): Action: Processor Reset", HS_AppData.AMTablePtr[TableIndex].AppName); @@ -130,14 +139,16 @@ void HS_MonitorApplications(void) } else { - CFE_EVS_SendEvent(HS_RESET_LIMIT_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_RESET_LIMIT_ERR_EID, + CFE_EVS_EventType_ERROR, "Processor Reset Action Limit Reached: No Reset Performed"); } break; case HS_AMTActType_APP_RESTART: - CFE_EVS_SendEvent(HS_APPMON_RESTART_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_APPMON_RESTART_ERR_EID, + CFE_EVS_EventType_ERROR, "App Monitor Failure: APP:(%s) Action: Restart Application", HS_AppData.AMTablePtr[TableIndex].AppName); /* @@ -153,15 +164,18 @@ void HS_MonitorApplications(void) */ if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_APPMON_NOT_RESTARTED_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_APPMON_NOT_RESTARTED_ERR_EID, + CFE_EVS_EventType_ERROR, "Call to Restart App Failed: APP:(%s) ERR: 0x%08X", - HS_AppData.AMTablePtr[TableIndex].AppName, (unsigned int)Status); + HS_AppData.AMTablePtr[TableIndex].AppName, + (unsigned int)Status); } break; case HS_AMTActType_EVENT: - CFE_EVS_SendEvent(HS_APPMON_FAIL_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_APPMON_FAIL_ERR_EID, + CFE_EVS_EventType_ERROR, "App Monitor Failure: APP:(%s): Action: Event Only", HS_AppData.AMTablePtr[TableIndex].AppName); break; @@ -182,20 +196,23 @@ void HS_MonitorApplications(void) /* ** Send the message if off cooldown and not disabled */ - if ((HS_AppData.MsgActCooldown[MsgActsIndex] == 0) && - (HS_AppData.MATablePtr[MsgActsIndex].EnableState != HS_MATState_DISABLED)) + if ((HS_AppData.MsgActCooldown[MsgActsIndex] == 0) + && (HS_AppData.MATablePtr[MsgActsIndex].EnableState != HS_MATState_DISABLED)) { CFE_SB_TransmitMsg( - (const CFE_MSG_Message_t *)&HS_AppData.MATablePtr[MsgActsIndex].MsgBuf, true); + (const CFE_MSG_Message_t *)&HS_AppData.MATablePtr[MsgActsIndex].MsgBuf, + true); HS_AppData.MsgActExec++; HS_AppData.MsgActCooldown[MsgActsIndex] = HS_AppData.MATablePtr[MsgActsIndex].Cooldown; if (HS_AppData.MATablePtr[MsgActsIndex].EnableState != HS_MATState_NOEVENT) { CFE_EVS_SendEvent( - HS_APPMON_MSGACTS_ERR_EID, CFE_EVS_EventType_ERROR, + HS_APPMON_MSGACTS_ERR_EID, + CFE_EVS_EventType_ERROR, "App Monitor Failure: APP:(%s): Action: Message Action Index: %d", - HS_AppData.AMTablePtr[TableIndex].AppName, (int)MsgActsIndex); + HS_AppData.AMTablePtr[TableIndex].AppName, + (int)MsgActsIndex); } } } @@ -227,6 +244,12 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) uint32 MsgActsIndex = 0; CFE_SB_Buffer_t *SendPtr = NULL; + /* Avoid accessing EMT if table pointer is invalid */ + if (HS_AppData.EMTablePtr == NULL) + { + return; + } + for (TableIndex = 0; TableIndex < HS_MAX_MONITORED_EVENTS; TableIndex++) { ActionType = HS_AppData.EMTablePtr[TableIndex].ActionType; @@ -234,11 +257,11 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) /* ** Check this Event Monitor if it has an action, and the event IDs match */ - if ((ActionType != HS_EMTActType_NOACT) && - (HS_AppData.EMTablePtr[TableIndex].EventID == EventPtr->Payload.PacketID.EventID)) + if ((ActionType != HS_EMTActType_NOACT) + && (HS_AppData.EMTablePtr[TableIndex].EventID == EventPtr->Payload.PacketID.EventID)) { - if (strncmp(HS_AppData.EMTablePtr[TableIndex].AppName, EventPtr->Payload.PacketID.AppName, - OS_MAX_API_NAME) == 0) + if (strncmp(HS_AppData.EMTablePtr[TableIndex].AppName, EventPtr->Payload.PacketID.AppName, OS_MAX_API_NAME) + == 0) { /* ** Perform the action if the strings also match @@ -246,7 +269,8 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) switch (ActionType) { case HS_EMTActType_PROC_RESET: - CFE_EVS_SendEvent(HS_EVENTMON_PROC_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EVENTMON_PROC_ERR_EID, + CFE_EVS_EventType_ERROR, "Event Monitor: APP:(%s) EID:(%d): Action: Processor Reset", HS_AppData.EMTablePtr[TableIndex].AppName, HS_AppData.EMTablePtr[TableIndex].EventID); @@ -267,7 +291,8 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) } else { - CFE_EVS_SendEvent(HS_RESET_LIMIT_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_RESET_LIMIT_ERR_EID, + CFE_EVS_EventType_ERROR, "Processor Reset Action Limit Reached: No Reset Performed"); } @@ -280,7 +305,8 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) Status = CFE_ES_GetAppIDByName(&AppId, HS_AppData.EMTablePtr[TableIndex].AppName); if (Status == CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_EVENTMON_RESTART_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EVENTMON_RESTART_ERR_EID, + CFE_EVS_EventType_ERROR, "Event Monitor: APP:(%s) EID:(%d): Action: Restart Application", HS_AppData.EMTablePtr[TableIndex].AppName, HS_AppData.EMTablePtr[TableIndex].EventID); @@ -289,9 +315,11 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_EVENTMON_NOT_RESTARTED_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EVENTMON_NOT_RESTARTED_ERR_EID, + CFE_EVS_EventType_ERROR, "Call to Restart App Failed: APP:(%s) ERR: 0x%08X", - HS_AppData.EMTablePtr[TableIndex].AppName, (unsigned int)Status); + HS_AppData.EMTablePtr[TableIndex].AppName, + (unsigned int)Status); } break; @@ -303,7 +331,8 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) Status = CFE_ES_GetAppIDByName(&AppId, HS_AppData.EMTablePtr[TableIndex].AppName); if (Status == CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_EVENTMON_DELETE_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EVENTMON_DELETE_ERR_EID, + CFE_EVS_EventType_ERROR, "Event Monitor: APP:(%s) EID:(%d): Action: Delete Application", HS_AppData.EMTablePtr[TableIndex].AppName, HS_AppData.EMTablePtr[TableIndex].EventID); @@ -312,9 +341,11 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) if (Status != CFE_SUCCESS) { - CFE_EVS_SendEvent(HS_EVENTMON_NOT_DELETED_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EVENTMON_NOT_DELETED_ERR_EID, + CFE_EVS_EventType_ERROR, "Call to Delete App Failed: APP:(%s) ERR: 0x%08X", - HS_AppData.EMTablePtr[TableIndex].AppName, (unsigned int)Status); + HS_AppData.EMTablePtr[TableIndex].AppName, + (unsigned int)Status); } break; @@ -335,8 +366,8 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) /* ** Send the message if off cooldown and not disabled */ - if ((HS_AppData.MsgActCooldown[MsgActsIndex] == 0) && - (HS_AppData.MATablePtr[MsgActsIndex].EnableState != HS_MATState_DISABLED)) + if ((HS_AppData.MsgActCooldown[MsgActsIndex] == 0) + && (HS_AppData.MATablePtr[MsgActsIndex].EnableState != HS_MATState_DISABLED)) { SendPtr = (CFE_SB_Buffer_t *)&HS_AppData.MATablePtr[MsgActsIndex].MsgBuf; CFE_SB_TransmitMsg(&SendPtr->Msg, true); @@ -346,10 +377,12 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) if (HS_AppData.MATablePtr[MsgActsIndex].EnableState != HS_MATState_NOEVENT) { CFE_EVS_SendEvent( - HS_EVENTMON_MSGACTS_ERR_EID, CFE_EVS_EventType_ERROR, + HS_EVENTMON_MSGACTS_ERR_EID, + CFE_EVS_EventType_ERROR, "Event Monitor: APP:(%s) EID:(%d): Action: Message Action Index: %d", HS_AppData.EMTablePtr[TableIndex].AppName, - HS_AppData.EMTablePtr[TableIndex].EventID, (int)MsgActsIndex); + HS_AppData.EMTablePtr[TableIndex].EventID, + (int)MsgActsIndex); } } } @@ -434,8 +467,8 @@ void HS_MonitorUtilization(void) } else { - if ((UtilIndex <= ThisUtilIndex) || - (UtilIndex > (HS_UTIL_PEAK_NUM_INTERVAL - (HS_UTIL_AVERAGE_NUM_INTERVAL - ThisUtilIndex)))) + if ((UtilIndex <= ThisUtilIndex) + || (UtilIndex > (HS_UTIL_PEAK_NUM_INTERVAL - (HS_UTIL_AVERAGE_NUM_INTERVAL - ThisUtilIndex)))) { CombinedUtil += HS_AppData.UtilizationTracker[UtilIndex]; } @@ -471,7 +504,8 @@ int32 HS_ValidateAMTable(void *TableData) if (TableData == NULL) { - CFE_EVS_SendEvent(HS_AM_TBL_NULL_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_AM_TBL_NULL_ERR_EID, + CFE_EVS_EventType_ERROR, "Error in AM Table Validation. Table is null."); return HS_TBL_VAL_ERR; @@ -521,9 +555,13 @@ int32 HS_ValidateAMTable(void *TableData) { strncpy(BadName, TableArray[TableIndex].AppName, OS_MAX_API_NAME - 1); BadName[OS_MAX_API_NAME - 1] = '\0'; - CFE_EVS_SendEvent(HS_AMTVal_ERR_EID, CFE_EVS_EventType_ERROR, - "AppMon verify err: Entry = %d, Err = %d, Action = %d, App = %s", (int)TableIndex, - (int)EntryResult, ActionType, BadName); + CFE_EVS_SendEvent(HS_AMTVal_ERR_EID, + CFE_EVS_EventType_ERROR, + "AppMon verify err: Entry = %d, Err = %d, Action = %d, App = %s", + (int)TableIndex, + (int)EntryResult, + ActionType, + BadName); TableResult = EntryResult; } } @@ -531,8 +569,11 @@ int32 HS_ValidateAMTable(void *TableData) /* ** Generate informational event with error totals */ - CFE_EVS_SendEvent(HS_AMTVal_INF_EID, CFE_EVS_EventType_INFORMATION, - "AppMon verify results: good = %d, bad = %d, unused = %d", (int)GoodCount, (int)BadCount, + CFE_EVS_SendEvent(HS_AMTVal_INF_EID, + CFE_EVS_EventType_INFORMATION, + "AppMon verify results: good = %d, bad = %d, unused = %d", + (int)GoodCount, + (int)BadCount, (int)UnusedCount); return TableResult; @@ -562,7 +603,8 @@ int32 HS_ValidateEMTable(void *TableData) if (TableData == NULL) { - CFE_EVS_SendEvent(HS_EM_TBL_NULL_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EM_TBL_NULL_ERR_EID, + CFE_EVS_EventType_ERROR, "Error in EM Table Validation. Table is null."); return HS_TBL_VAL_ERR; @@ -612,9 +654,14 @@ int32 HS_ValidateEMTable(void *TableData) { strncpy(BadName, TableArray[TableIndex].AppName, OS_MAX_API_NAME - 1); BadName[OS_MAX_API_NAME - 1] = '\0'; - CFE_EVS_SendEvent(HS_EMTVal_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_EMTVal_ERR_EID, + CFE_EVS_EventType_ERROR, "EventMon verify err: Entry = %d, Err = %d, Action = %d, ID = %d App = %s", - (int)TableIndex, (int)EntryResult, ActionType, EventID, BadName); + (int)TableIndex, + (int)EntryResult, + ActionType, + EventID, + BadName); TableResult = EntryResult; } } @@ -622,8 +669,11 @@ int32 HS_ValidateEMTable(void *TableData) /* ** Generate informational event with error totals */ - CFE_EVS_SendEvent(HS_EMTVal_INF_EID, CFE_EVS_EventType_INFORMATION, - "EventMon verify results: good = %d, bad = %d, unused = %d", (int)GoodCount, (int)BadCount, + CFE_EVS_SendEvent(HS_EMTVal_INF_EID, + CFE_EVS_EventType_INFORMATION, + "EventMon verify results: good = %d, bad = %d, unused = %d", + (int)GoodCount, + (int)BadCount, (int)UnusedCount); return TableResult; @@ -651,7 +701,8 @@ int32 HS_ValidateXCTable(void *TableData) if (TableData == NULL) { - CFE_EVS_SendEvent(HS_XC_TBL_NULL_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_XC_TBL_NULL_ERR_EID, + CFE_EVS_EventType_ERROR, "Error in XC Table Validation. Table is null."); return HS_TBL_VAL_ERR; @@ -678,8 +729,8 @@ int32 HS_ValidateXCTable(void *TableData) EntryResult = HS_XCTVal_ERR_NUL; BadCount++; } - else if ((ResourceType != HS_XCTResType_APP_MAIN) && (ResourceType != HS_XCTResType_APP_CHILD) && - (ResourceType != HS_XCTResType_DEVICE) && (ResourceType != HS_XCTResType_ISR)) + else if ((ResourceType != HS_XCTResType_APP_MAIN) && (ResourceType != HS_XCTResType_APP_CHILD) + && (ResourceType != HS_XCTResType_DEVICE) && (ResourceType != HS_XCTResType_ISR)) { /* ** Resource Type is not valid @@ -702,9 +753,13 @@ int32 HS_ValidateXCTable(void *TableData) { strncpy(BadName, TableArray[TableIndex].ResourceName, OS_MAX_API_NAME - 1); BadName[OS_MAX_API_NAME - 1] = '\0'; - CFE_EVS_SendEvent(HS_XCTVal_ERR_EID, CFE_EVS_EventType_ERROR, - "ExeCount verify err: Entry = %d, Err = %d, Type = %d, Name = %s", (int)TableIndex, - (int)EntryResult, ResourceType, BadName); + CFE_EVS_SendEvent(HS_XCTVal_ERR_EID, + CFE_EVS_EventType_ERROR, + "ExeCount verify err: Entry = %d, Err = %d, Type = %d, Name = %s", + (int)TableIndex, + (int)EntryResult, + ResourceType, + BadName); TableResult = EntryResult; } } @@ -712,8 +767,11 @@ int32 HS_ValidateXCTable(void *TableData) /* ** Generate informational event with error totals */ - CFE_EVS_SendEvent(HS_XCTVal_INF_EID, CFE_EVS_EventType_INFORMATION, - "ExeCount verify results: good = %d, bad = %d, unused = %d", (int)GoodCount, (int)BadCount, + CFE_EVS_SendEvent(HS_XCTVal_INF_EID, + CFE_EVS_EventType_INFORMATION, + "ExeCount verify results: good = %d, bad = %d, unused = %d", + (int)GoodCount, + (int)BadCount, (int)UnusedCount); return TableResult; @@ -743,7 +801,8 @@ int32 HS_ValidateMATable(void *TableData) if (TableData == NULL) { - CFE_EVS_SendEvent(HS_MA_TBL_NULL_ERR_EID, CFE_EVS_EventType_ERROR, + CFE_EVS_SendEvent(HS_MA_TBL_NULL_ERR_EID, + CFE_EVS_EventType_ERROR, "Error in MA Table Validation. Table is null."); return HS_TBL_VAL_ERR; @@ -800,9 +859,13 @@ int32 HS_ValidateMATable(void *TableData) */ if ((EntryResult != HS_MATVal_NO_ERR) && (TableResult == CFE_SUCCESS)) { - CFE_EVS_SendEvent(HS_MATVal_ERR_EID, CFE_EVS_EventType_ERROR, - "MsgActs verify err: Entry = %d, Err = %d, Length = %d, ID = 0x%08lX", (int)TableIndex, - (int)EntryResult, (int)Length, (unsigned long)CFE_SB_MsgIdToValue(MessageID)); + CFE_EVS_SendEvent(HS_MATVal_ERR_EID, + CFE_EVS_EventType_ERROR, + "MsgActs verify err: Entry = %d, Err = %d, Length = %d, ID = 0x%08lX", + (int)TableIndex, + (int)EntryResult, + (int)Length, + (unsigned long)CFE_SB_MsgIdToValue(MessageID)); TableResult = EntryResult; } } @@ -810,8 +873,11 @@ int32 HS_ValidateMATable(void *TableData) /* ** Generate informational event with error totals */ - CFE_EVS_SendEvent(HS_MATVal_INF_EID, CFE_EVS_EventType_INFORMATION, - "MsgActs verify results: good = %d, bad = %d, unused = %d", (int)GoodCount, (int)BadCount, + CFE_EVS_SendEvent(HS_MATVal_INF_EID, + CFE_EVS_EventType_INFORMATION, + "MsgActs verify results: good = %d, bad = %d, unused = %d", + (int)GoodCount, + (int)BadCount, (int)UnusedCount); return TableResult; diff --git a/fsw/src/hs_sysmon.c b/fsw/src/hs_sysmon.c index 89e503f..2b9047a 100644 --- a/fsw/src/hs_sysmon.c +++ b/fsw/src/hs_sysmon.c @@ -55,29 +55,33 @@ CFE_Status_t HS_SysMonInit(void) } else { - CFE_ES_WriteToSysLog("%s(): System Monitor using PSP device ID %08lx\n", __func__, + CFE_ES_WriteToSysLog("%s(): System Monitor using PSP device ID %08lx\n", + __func__, (unsigned long)HS_AppData.SysMonPspModuleId); Location.PspModuleId = HS_AppData.SysMonPspModuleId; Location.SubsystemId = 0; Location.SubchannelId = 0; - if (CFE_PSP_IODriver_Command(&Location, CFE_PSP_IODriver_SET_RUNNING, CFE_PSP_IODriver_U32ARG(1)) != - CFE_PSP_SUCCESS) + if (CFE_PSP_IODriver_Command(&Location, CFE_PSP_IODriver_SET_RUNNING, CFE_PSP_IODriver_U32ARG(1)) + != CFE_PSP_SUCCESS) { - CFE_ES_WriteToSysLog("%s(): Unable to start device %08lx\n", __func__, + CFE_ES_WriteToSysLog("%s(): Unable to start device %08lx\n", + __func__, (unsigned long)HS_AppData.SysMonPspModuleId); StatusCode = CFE_STATUS_EXTERNAL_RESOURCE_FAIL; } else { /* find the subsystem */ - StatusCode = CFE_PSP_IODriver_Command(&Location, CFE_PSP_IODriver_LOOKUP_SUBSYSTEM, + StatusCode = CFE_PSP_IODriver_Command(&Location, + CFE_PSP_IODriver_LOOKUP_SUBSYSTEM, CFE_PSP_IODriver_CONST_STR(HS_SYSTEM_MONITOR_SUBSYSTEM_NAME)); if (StatusCode < 0) { - CFE_ES_WriteToSysLog("%s(): Unable to find subsystem \'%s\'\n", __func__, + CFE_ES_WriteToSysLog("%s(): Unable to find subsystem \'%s\'\n", + __func__, HS_SYSTEM_MONITOR_SUBSYSTEM_NAME); HS_AppData.SysMonSubsystemId = 0; } @@ -87,12 +91,14 @@ CFE_Status_t HS_SysMonInit(void) } Location.SubsystemId = HS_AppData.SysMonSubsystemId; - StatusCode = CFE_PSP_IODriver_Command(&Location, CFE_PSP_IODriver_LOOKUP_SUBCHANNEL, + StatusCode = CFE_PSP_IODriver_Command(&Location, + CFE_PSP_IODriver_LOOKUP_SUBCHANNEL, CFE_PSP_IODriver_CONST_STR(HS_SYSTEM_MONITOR_SUBCHANNEL_NAME)); if (StatusCode < 0) { - CFE_ES_WriteToSysLog("%s(): Unable to find channel \'%s\'\n", __func__, + CFE_ES_WriteToSysLog("%s(): Unable to find channel \'%s\'\n", + __func__, HS_SYSTEM_MONITOR_SUBCHANNEL_NAME); HS_AppData.SysMonSubchannelId = 0; } @@ -119,10 +125,11 @@ void HS_SysMonCleanup(void) Location.SubsystemId = 0; Location.SubchannelId = 0; - if (CFE_PSP_IODriver_Command(&Location, CFE_PSP_IODriver_SET_RUNNING, CFE_PSP_IODriver_U32ARG(0)) != - CFE_PSP_SUCCESS) + if (CFE_PSP_IODriver_Command(&Location, CFE_PSP_IODriver_SET_RUNNING, CFE_PSP_IODriver_U32ARG(0)) + != CFE_PSP_SUCCESS) { - CFE_ES_WriteToSysLog("%s(): Unable to stop device %08lx\n", __func__, + CFE_ES_WriteToSysLog("%s(): Unable to stop device %08lx\n", + __func__, (unsigned long)HS_AppData.SysMonPspModuleId); } } @@ -135,11 +142,11 @@ void HS_SysMonCleanup(void) */ CFE_Status_t HS_SysMonGetCpuUtilization(void) { - const CFE_PSP_IODriver_Location_t Location = {.PspModuleId = HS_AppData.SysMonPspModuleId, - .SubsystemId = HS_AppData.SysMonSubsystemId, - .SubchannelId = HS_AppData.SysMonSubchannelId}; + const CFE_PSP_IODriver_Location_t Location = { .PspModuleId = HS_AppData.SysMonPspModuleId, + .SubsystemId = HS_AppData.SysMonSubsystemId, + .SubchannelId = HS_AppData.SysMonSubchannelId }; CFE_PSP_IODriver_AdcCode_t Sample = 0; - CFE_PSP_IODriver_AnalogRdWr_t RdWr = {.NumChannels = 1, .Samples = &Sample}; + CFE_PSP_IODriver_AnalogRdWr_t RdWr = { .NumChannels = 1, .Samples = &Sample }; CFE_Status_t StatusCode; int32 Value; @@ -150,7 +157,8 @@ CFE_Status_t HS_SysMonGetCpuUtilization(void) } else { - StatusCode = CFE_PSP_IODriver_Command(&Location, CFE_PSP_IODriver_ANALOG_IO_READ_CHANNELS, + StatusCode = CFE_PSP_IODriver_Command(&Location, + CFE_PSP_IODriver_ANALOG_IO_READ_CHANNELS, CFE_PSP_IODriver_VPARG(&RdWr)); } diff --git a/fsw/src/hs_version.h b/fsw/src/hs_version.h index 80f1def..15ef926 100644 --- a/fsw/src/hs_version.h +++ b/fsw/src/hs_version.h @@ -30,8 +30,8 @@ * \{ */ -#define HS_MAJOR_VERSION 7 /**< \brief Major version number */ -#define HS_MINOR_VERSION 0 /**< \brief Minor version number */ +#define HS_MAJOR_VERSION 7 /**< \brief Major version number */ +#define HS_MINOR_VERSION 0 /**< \brief Minor version number */ #define HS_REVISION 0 /**< \brief Revision number */ /**\}*/ diff --git a/fsw/tables/hs_amt.c b/fsw/tables/hs_amt.c index e754ca6..879d728 100644 --- a/fsw/tables/hs_amt.c +++ b/fsw/tables/hs_amt.c @@ -33,38 +33,69 @@ HS_AMTEntry_t HS_AppMon_Tbl[HS_MAX_MONITORED_APPS] = { /* AppName NullTerm CycleCount ActionType */ - /* 0 */ {"CFE_ES", 0, 10, HS_AMTActType_NOACT}, - /* 1 */ {"CFE_EVS", 0, 10, HS_AMTActType_NOACT}, - /* 2 */ {"CFE_TIME", 0, 10, HS_AMTActType_NOACT}, - /* 3 */ {"CFE_TBL", 0, 10, HS_AMTActType_NOACT}, - /* 4 */ {"CFE_SB", 0, 10, HS_AMTActType_NOACT}, - /* 5 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 6 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 7 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 8 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 9 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 10 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 11 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 12 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 13 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 14 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 15 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 16 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 17 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 18 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 19 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 20 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 21 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 22 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 23 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 24 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 25 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 26 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 27 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 28 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 29 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 30 */ {"", 0, 10, HS_AMTActType_NOACT}, - /* 31 */ {"", 0, 10, HS_AMTActType_NOACT}, + /* 0 */ { "CFE_ES", 0, 10, HS_AMTActType_NOACT }, + /* 1 */ + { "CFE_EVS", 0, 10, HS_AMTActType_NOACT }, + /* 2 */ + { "CFE_TIME", 0, 10, HS_AMTActType_NOACT }, + /* 3 */ + { "CFE_TBL", 0, 10, HS_AMTActType_NOACT }, + /* 4 */ + { "CFE_SB", 0, 10, HS_AMTActType_NOACT }, + /* 5 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 6 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 7 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 8 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 9 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 10 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 11 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 12 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 13 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 14 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 15 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 16 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 17 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 18 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 19 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 20 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 21 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 22 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 23 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 24 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 25 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 26 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 27 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 28 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 29 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 30 */ + { "", 0, 10, HS_AMTActType_NOACT }, + /* 31 */ + { "", 0, 10, HS_AMTActType_NOACT }, }; CFE_TBL_FILEDEF(HS_AppMon_Tbl, HS.AppMon_Tbl, HS AppMon Table, hs_amt.tbl) diff --git a/fsw/tables/hs_emt.c b/fsw/tables/hs_emt.c index 27402c8..b08a6a2 100644 --- a/fsw/tables/hs_emt.c +++ b/fsw/tables/hs_emt.c @@ -30,26 +30,44 @@ #include "hs_tbldefs.h" #include "cfe_tbl_filedef.h" -CFE_TBL_FileDef_t CFE_TBL_FileDef = {"HS_EventMon_Tbl", HS_APP_NAME ".EventMon_Tbl", "HS EventMon Table", "hs_emt.tbl", - (sizeof(HS_EMTEntry_t) * HS_MAX_MONITORED_EVENTS)}; +CFE_TBL_FileDef_t CFE_TBL_FileDef = { "HS_EventMon_Tbl", + HS_APP_NAME ".EventMon_Tbl", + "HS EventMon Table", + "hs_emt.tbl", + (sizeof(HS_EMTEntry_t) * HS_MAX_MONITORED_EVENTS) }; HS_EMTEntry_t HS_EventMon_Tbl[HS_MAX_MONITORED_EVENTS] = { /* AppName NullTerm EventID ActionType */ - /* 0 */ {"CFE_ES", 0, 10, HS_EMTActType_NOACT}, - /* 1 */ {"CFE_EVS", 0, 10, HS_EMTActType_NOACT}, - /* 2 */ {"CFE_TIME", 0, 10, HS_EMTActType_NOACT}, - /* 3 */ {"CFE_TBL", 0, 10, HS_EMTActType_NOACT}, - /* 4 */ {"CFE_SB", 0, 10, HS_EMTActType_NOACT}, - /* 5 */ {"", 0, 10, HS_EMTActType_NOACT}, - /* 6 */ {"", 0, 10, HS_EMTActType_NOACT}, - /* 7 */ {"", 0, 10, HS_EMTActType_NOACT}, - /* 8 */ {"", 0, 10, HS_EMTActType_NOACT}, - /* 9 */ {"", 0, 10, HS_EMTActType_NOACT}, - /* 10 */ {"", 0, 10, HS_EMTActType_NOACT}, - /* 11 */ {"", 0, 10, HS_EMTActType_NOACT}, - /* 12 */ {"", 0, 10, HS_EMTActType_NOACT}, - /* 13 */ {"", 0, 10, HS_EMTActType_NOACT}, - /* 14 */ {"", 0, 10, HS_EMTActType_NOACT}, - /* 15 */ {"", 0, 10, HS_EMTActType_NOACT}, + /* 0 */ { "CFE_ES", 0, 10, HS_EMTActType_NOACT }, + /* 1 */ + { "CFE_EVS", 0, 10, HS_EMTActType_NOACT }, + /* 2 */ + { "CFE_TIME", 0, 10, HS_EMTActType_NOACT }, + /* 3 */ + { "CFE_TBL", 0, 10, HS_EMTActType_NOACT }, + /* 4 */ + { "CFE_SB", 0, 10, HS_EMTActType_NOACT }, + /* 5 */ + { "", 0, 10, HS_EMTActType_NOACT }, + /* 6 */ + { "", 0, 10, HS_EMTActType_NOACT }, + /* 7 */ + { "", 0, 10, HS_EMTActType_NOACT }, + /* 8 */ + { "", 0, 10, HS_EMTActType_NOACT }, + /* 9 */ + { "", 0, 10, HS_EMTActType_NOACT }, + /* 10 */ + { "", 0, 10, HS_EMTActType_NOACT }, + /* 11 */ + { "", 0, 10, HS_EMTActType_NOACT }, + /* 12 */ + { "", 0, 10, HS_EMTActType_NOACT }, + /* 13 */ + { "", 0, 10, HS_EMTActType_NOACT }, + /* 14 */ + { "", 0, 10, HS_EMTActType_NOACT }, + /* 15 */ + { "", 0, 10, HS_EMTActType_NOACT }, }; diff --git a/fsw/tables/hs_mat.c b/fsw/tables/hs_mat.c index 9164ab3..1ee2e46 100644 --- a/fsw/tables/hs_mat.c +++ b/fsw/tables/hs_mat.c @@ -66,38 +66,56 @@ HS_MatTableEntry_t HS_MsgActs_Tbl[HS_MAX_MSG_ACT_TYPES] = { /* EnableState Cooldown Message */ /* 0 */ - {.EnableState = HS_MATState_ENABLED, + { .EnableState = HS_MATState_ENABLED, .Cooldown = 10, - .HsMsg.cmd1 = {CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, HS_MEMBER_SIZE(cmd1), CFE_TBL_NOOP_CC, CFE_TBL_NOOP_CKSUM)}}, + .HsMsg.cmd1 = { CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, + HS_MEMBER_SIZE(cmd1), + CFE_TBL_NOOP_CC, + CFE_TBL_NOOP_CKSUM) } }, /* 1 */ - {.EnableState = HS_MATState_ENABLED, + { .EnableState = HS_MATState_ENABLED, .Cooldown = 10, - .HsMsg.cmd2 = {CFE_MSG_CMD_HDR_INIT(CFE_ES_CMD_MID, HS_MEMBER_SIZE(cmd2), CFE_ES_NOOP_CC, CFE_ES_NOOP_CKSUM)}}, + .HsMsg.cmd2 = { CFE_MSG_CMD_HDR_INIT(CFE_ES_CMD_MID, HS_MEMBER_SIZE(cmd2), CFE_ES_NOOP_CC, CFE_ES_NOOP_CKSUM) } }, /* 2 */ - {.EnableState = HS_MATState_DISABLED, + { .EnableState = HS_MATState_DISABLED, .Cooldown = 10, - .HsMsg.cmd1 = {CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, HS_MEMBER_SIZE(cmd1), CFE_TBL_NOOP_CC, CFE_TBL_NOOP_CKSUM)}}, + .HsMsg.cmd1 = { CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, + HS_MEMBER_SIZE(cmd1), + CFE_TBL_NOOP_CC, + CFE_TBL_NOOP_CKSUM) } }, /* 3 */ - {.EnableState = HS_MATState_DISABLED, + { .EnableState = HS_MATState_DISABLED, .Cooldown = 10, - .HsMsg.cmd1 = {CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, HS_MEMBER_SIZE(cmd1), CFE_TBL_NOOP_CC, CFE_TBL_NOOP_CKSUM)}}, + .HsMsg.cmd1 = { CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, + HS_MEMBER_SIZE(cmd1), + CFE_TBL_NOOP_CC, + CFE_TBL_NOOP_CKSUM) } }, /* 4 */ - {.EnableState = HS_MATState_DISABLED, + { .EnableState = HS_MATState_DISABLED, .Cooldown = 10, - .HsMsg.cmd1 = {CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, HS_MEMBER_SIZE(cmd1), CFE_TBL_NOOP_CC, CFE_TBL_NOOP_CKSUM)}}, + .HsMsg.cmd1 = { CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, + HS_MEMBER_SIZE(cmd1), + CFE_TBL_NOOP_CC, + CFE_TBL_NOOP_CKSUM) } }, /* 5 */ - {.EnableState = HS_MATState_DISABLED, + { .EnableState = HS_MATState_DISABLED, .Cooldown = 10, - .HsMsg.cmd1 = {CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, HS_MEMBER_SIZE(cmd1), CFE_TBL_NOOP_CC, CFE_TBL_NOOP_CKSUM)}}, + .HsMsg.cmd1 = { CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, + HS_MEMBER_SIZE(cmd1), + CFE_TBL_NOOP_CC, + CFE_TBL_NOOP_CKSUM) } }, /* 6 */ - {.EnableState = HS_MATState_DISABLED, + { .EnableState = HS_MATState_DISABLED, .Cooldown = 10, - .HsMsg.cmd1 = {CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, HS_MEMBER_SIZE(cmd1), CFE_TBL_NOOP_CC, CFE_TBL_NOOP_CKSUM)}}, + .HsMsg.cmd1 = { CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, + HS_MEMBER_SIZE(cmd1), + CFE_TBL_NOOP_CC, + CFE_TBL_NOOP_CKSUM) } }, /* 7 */ - {.EnableState = HS_MATState_DISABLED, + { .EnableState = HS_MATState_DISABLED, .Cooldown = 10, - .HsMsg.cmd1 = {CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, HS_MEMBER_SIZE(cmd1), CFE_TBL_NOOP_CC, CFE_TBL_NOOP_CKSUM)}} - + .HsMsg + .cmd1 = { CFE_MSG_CMD_HDR_INIT(CFE_TBL_CMD_MID, HS_MEMBER_SIZE(cmd1), CFE_TBL_NOOP_CC, CFE_TBL_NOOP_CKSUM) } } }; CFE_TBL_FILEDEF(HS_MsgActs_Tbl, HS.MsgActs_Tbl, HS MsgActs Table, hs_mat.tbl) \ No newline at end of file diff --git a/fsw/tables/hs_xct.c b/fsw/tables/hs_xct.c index a535a33..233c248 100644 --- a/fsw/tables/hs_xct.c +++ b/fsw/tables/hs_xct.c @@ -33,38 +33,69 @@ HS_XCTEntry_t HS_ExeCount_Tbl[HS_MAX_EXEC_CNT_SLOTS] = { /* ResourceName NullTerm ResourceType */ - /* 0 */ {"CFE_ES", 0, HS_XCTResType_APP_MAIN}, - /* 1 */ {"CFE_EVS", 0, HS_XCTResType_APP_MAIN}, - /* 2 */ {"CFE_TIME", 0, HS_XCTResType_APP_MAIN}, - /* 3 */ {"CFE_TBL", 0, HS_XCTResType_APP_MAIN}, - /* 4 */ {"CFE_SB", 0, HS_XCTResType_APP_MAIN}, - /* 5 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 6 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 7 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 8 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 9 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 10 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 11 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 12 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 13 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 14 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 15 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 16 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 17 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 18 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 19 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 20 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 21 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 22 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 23 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 24 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 25 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 26 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 27 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 28 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 29 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 30 */ {"", 0, HS_XCTResType_NOTYPE}, - /* 31 */ {"", 0, HS_XCTResType_NOTYPE}, + /* 0 */ { "CFE_ES", 0, HS_XCTResType_APP_MAIN }, + /* 1 */ + { "CFE_EVS", 0, HS_XCTResType_APP_MAIN }, + /* 2 */ + { "CFE_TIME", 0, HS_XCTResType_APP_MAIN }, + /* 3 */ + { "CFE_TBL", 0, HS_XCTResType_APP_MAIN }, + /* 4 */ + { "CFE_SB", 0, HS_XCTResType_APP_MAIN }, + /* 5 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 6 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 7 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 8 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 9 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 10 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 11 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 12 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 13 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 14 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 15 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 16 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 17 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 18 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 19 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 20 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 21 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 22 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 23 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 24 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 25 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 26 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 27 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 28 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 29 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 30 */ + { "", 0, HS_XCTResType_NOTYPE }, + /* 31 */ + { "", 0, HS_XCTResType_NOTYPE }, }; CFE_TBL_FILEDEF(HS_ExeCount_Tbl, HS.ExeCount_Tbl, HS ExeCount Table, hs_xct.tbl) diff --git a/unit-test/hs_app_tests.c b/unit-test/hs_app_tests.c index e6cd485..2b3c236 100644 --- a/unit-test/hs_app_tests.c +++ b/unit-test/hs_app_tests.c @@ -50,7 +50,8 @@ uint8 call_count_CFE_EVS_SendEvent; uint16 HS_APP_TEST_CFE_SB_RcvMsgHookCount; uint32 UT_WaitForStartupSyncTimeout; -void UT_UpdatedDefaultHandler_CFE_SB_ReceiveBuffer(void *UserObj, UT_EntryKey_t FuncKey, +void UT_UpdatedDefaultHandler_CFE_SB_ReceiveBuffer(void *UserObj, + UT_EntryKey_t FuncKey, const UT_StubContext_t *Context) { CFE_SB_Buffer_t **BufPtr = UT_Hook_GetArgValueByName(Context, "BufPtr", CFE_SB_Buffer_t **); @@ -115,7 +116,9 @@ int32 HS_APP_TEST_CFE_TBL_LoadHook3(void *UserObj, int32 StubRetcode, uint32 Cal return CFE_SUCCESS; } -int32 HS_APP_TEST_CFE_ES_RestoreFromCDSHook(void *UserObj, int32 StubRetcode, uint32 CallCount, +int32 HS_APP_TEST_CFE_ES_RestoreFromCDSHook(void *UserObj, + int32 StubRetcode, + uint32 CallCount, const UT_StubContext_t *Context) { /* Restore the HS_AppData.CDSData that was memset in HS_AppInit */ @@ -125,7 +128,9 @@ int32 HS_APP_TEST_CFE_ES_RestoreFromCDSHook(void *UserObj, int32 StubRetcode, ui return CFE_SUCCESS; } -int32 HS_APP_TEST_CFE_ES_WaitForStartupSyncHook1(void *UserObj, int32 StubRetcode, uint32 CallCount, +int32 HS_APP_TEST_CFE_ES_WaitForStartupSyncHook1(void *UserObj, + int32 StubRetcode, + uint32 CallCount, const UT_StubContext_t *Context) { UT_WaitForStartupSyncTimeout = UT_Hook_GetArgValueByName(Context, "TimeOutMilliseconds", uint32); @@ -138,7 +143,9 @@ int32 HS_APP_TEST_CFE_ES_WaitForStartupSyncHook1(void *UserObj, int32 StubRetcod return 0; } -int32 HS_APP_TEST_CFE_EVS_RegisterHook(void *UserObj, int32 StubRetcode, uint32 CallCount, +int32 HS_APP_TEST_CFE_EVS_RegisterHook(void *UserObj, + int32 StubRetcode, + uint32 CallCount, const UT_StubContext_t *Context) { /* HS_AppInit sets CurrentEventMonState to HS_APPMON_DEFAULT_STATE, so change it to disabled at @@ -149,7 +156,9 @@ int32 HS_APP_TEST_CFE_EVS_RegisterHook(void *UserObj, int32 StubRetcode, uint32 return 0; } -int32 HS_APP_TEST_CFE_ES_ExitAppHook(void *UserObj, int32 StubRetcode, uint32 CallCount, +int32 HS_APP_TEST_CFE_ES_ExitAppHook(void *UserObj, + int32 StubRetcode, + uint32 CallCount, const UT_StubContext_t *Context) { HS_AppData.EventsMonitoredCount++; @@ -212,7 +221,8 @@ void HS_AppMain_Test_NominalRcvMsgSuccess(void) /* 1 event message that we don't care about in this test */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -244,7 +254,8 @@ void HS_AppMain_Test_NominalRcvMsgNoMessage(void) /* 1 event message that we don't care about in this test */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -276,7 +287,8 @@ void HS_AppMain_Test_NominalRcvMsgTimeOut(void) /* 2 event messages that we don't care about in this test */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -309,7 +321,8 @@ void HS_AppMain_Test_NominalRcvMsgError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -319,7 +332,8 @@ void HS_AppMain_Test_AppInitNotSuccess(void) char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Application Terminating, err = 0x%%08X"); char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "HS App: Application Terminating, ERR = 0x%%08X\n"); /* Set to make loop execute exactly once */ @@ -347,7 +361,8 @@ void HS_AppMain_Test_AppInitNotSuccess(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -359,7 +374,8 @@ void HS_AppMain_Test_ProcessMainNotSuccess(void) { int32 strCmpResult; char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "HS App: Application Terminating, ERR = 0x%%08X\n"); /* Set to make loop execute exactly once */ @@ -382,7 +398,8 @@ void HS_AppMain_Test_ProcessMainNotSuccess(void) /* 1 event message that we don't care about in this test */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -394,11 +411,13 @@ void HS_AppMain_Test_SBSubscribeEVSLongError(void) { int32 strCmpResult; char ExpectedEventString[3][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error Subscribing to long-format Events,RC=0x%%08X"); snprintf(ExpectedEventString[2], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Application Terminating, err = 0x%%08X"); char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "HS App: Application Terminating, ERR = 0x%%08X\n"); /* Set so the loop will never be run */ @@ -419,7 +438,8 @@ void HS_AppMain_Test_SBSubscribeEVSLongError(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 3, "CFE_EVS_SendEvent was called %u time(s), expected 3", + UtAssert_True(call_count_CFE_EVS_SendEvent == 3, + "CFE_EVS_SendEvent was called %u time(s), expected 3", call_count_CFE_EVS_SendEvent); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, HS_INIT_INF_EID); @@ -450,11 +470,13 @@ void HS_AppMain_Test_SBSubscribeEVSShortError(void) { int32 strCmpResult; char ExpectedEventString[3][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error Subscribing to short-format Events,RC=0x%%08X"); snprintf(ExpectedEventString[2], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Application Terminating, err = 0x%%08X"); char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "HS App: Application Terminating, ERR = 0x%%08X\n"); /* Set so the loop will never be run */ @@ -494,7 +516,8 @@ void HS_AppMain_Test_SBSubscribeEVSShortError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 3, "CFE_EVS_SendEvent was called %u time(s), expected 3", + UtAssert_True(call_count_CFE_EVS_SendEvent == 3, + "CFE_EVS_SendEvent was called %u time(s), expected 3", call_count_CFE_EVS_SendEvent); strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -508,7 +531,8 @@ void HS_AppMain_Test_RcvMsgError(void) char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Application Terminating, err = 0x%%08X"); char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "HS App: Application Terminating, ERR = 0x%%08X\n"); /* Set to make loop execute exactly once */ @@ -535,7 +559,8 @@ void HS_AppMain_Test_RcvMsgError(void) /* 1 event message that we don't care about in this test */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -563,7 +588,8 @@ void HS_AppMain_Test_StateDisabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -619,7 +645,8 @@ void HS_AppInit_Test_Nominal(void) /* 1 event message that we don't care about in this test */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -628,7 +655,8 @@ void HS_AppInit_Test_EVSRegisterError(void) CFE_Status_t Result; int32 strCmpResult; char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "HS App: Error Registering For Event Services, RC = 0x%%08X\n"); HS_AppData.ServiceWatchdogFlag = 99; @@ -667,7 +695,8 @@ void HS_AppInit_Test_EVSRegisterError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -681,7 +710,8 @@ void HS_AppInit_Test_CorruptCDSResetsPerformed(void) CFE_Status_t Result; int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Data in CDS was corrupt, initializing resets data"); snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "HS Initialized. Version %%d.%%d.%%d.%%d"); @@ -745,7 +775,8 @@ void HS_AppInit_Test_CorruptCDSResetsPerformed(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -755,7 +786,8 @@ void HS_AppInit_Test_CorruptCDSMaxResets(void) CFE_Status_t Result; int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Data in CDS was corrupt, initializing resets data"); snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "HS Initialized. Version %%d.%%d.%%d.%%d"); @@ -816,7 +848,8 @@ void HS_AppInit_Test_CorruptCDSMaxResets(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -872,7 +905,8 @@ void HS_AppInit_Test_CorruptCDSNoEvent(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -881,7 +915,8 @@ void HS_AppInit_Test_RestoreCDSError(void) CFE_Status_t Result; int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Failed to restore data from CDS (Err=0x%%08x), initializing resets data"); snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "HS Initialized. Version %%d.%%d.%%d.%%d"); @@ -925,7 +960,8 @@ void HS_AppInit_Test_RestoreCDSError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -980,7 +1016,8 @@ void HS_AppInit_Test_DisableSavingToCDS(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1037,7 +1074,8 @@ void HS_AppInit_Test_SBInitError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1094,7 +1132,8 @@ void HS_AppInit_Test_TblInitError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1156,7 +1195,8 @@ void HS_SbInit_Test_Nominal(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1193,7 +1233,8 @@ void HS_SbInit_Test_CreateSBCmdPipeError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1230,7 +1271,8 @@ void HS_SbInit_Test_CreateSBEventPipeError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1267,7 +1309,8 @@ void HS_SbInit_Test_CreateSBWakeupPipe(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1304,7 +1347,8 @@ void HS_SbInit_Test_SubscribeHKRequestError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1341,7 +1385,8 @@ void HS_SbInit_Test_SubscribeGndCmdsError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1378,7 +1423,8 @@ void HS_SbInit_Test_SubscribeWakeupError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1397,7 +1443,8 @@ void HS_TblInit_Test_Nominal(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1430,7 +1477,8 @@ void HS_TblInit_Test_RegisterAppMonTableError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1463,7 +1511,8 @@ void HS_TblInit_Test_RegisterEventMonTableError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1496,7 +1545,8 @@ void HS_TblInit_Test_RegisterMsgActsTableError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1529,7 +1579,8 @@ void HS_TblInit_Test_RegisterExeCountTableError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1561,7 +1612,8 @@ void HS_TblInit_Test_LoadExeCountTableError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 6, "CFE_EVS_SendEvent was called %u time(s), expected 6", + UtAssert_True(call_count_CFE_EVS_SendEvent == 6, + "CFE_EVS_SendEvent was called %u time(s), expected 6", call_count_CFE_EVS_SendEvent); } @@ -1571,7 +1623,8 @@ void HS_TblInit_Test_LoadAppMonTableError(void) int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error Loading AppMon Table,RC=0x%%08X"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Application Monitoring Disabled due to Table Load Failure"); /* Set CFE_TBL_Load to fail on second call, to generate error HS_AMT_LD_ERR_EID */ @@ -1606,7 +1659,8 @@ void HS_TblInit_Test_LoadAppMonTableError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -1616,7 +1670,8 @@ void HS_TblInit_Test_LoadEventMonTableError(void) int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error Loading EventMon Table,RC=0x%%08X"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitoring Disabled due to Table Load Failure"); /* Set CFE_TBL_Load to fail on third call, to generate error HS_EMT_LD_ERR_EID */ @@ -1651,7 +1706,8 @@ void HS_TblInit_Test_LoadEventMonTableError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -1684,7 +1740,8 @@ void HS_TblInit_Test_LoadMsgActsTableError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1730,7 +1787,8 @@ void HS_ProcessMain_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1776,7 +1834,8 @@ void HS_ProcessMain_Test_MonStateDisabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1821,7 +1880,8 @@ void HS_ProcessMain_Test_AlivenessDisabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1869,7 +1929,8 @@ void HS_ProcessMain_Test_WatchdogDisabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1920,7 +1981,8 @@ void HS_ProcessCommands_Test(void) call_count_CFE_SB_ReceiveBuffer = UT_GetStubCount(UT_KEY(CFE_SB_ReceiveBuffer)); - UtAssert_True(call_count_CFE_SB_ReceiveBuffer == 4, "CFE_SB_ReceiveBuffer was called %u time(s), expected 4", + UtAssert_True(call_count_CFE_SB_ReceiveBuffer == 4, + "CFE_SB_ReceiveBuffer was called %u time(s), expected 4", call_count_CFE_SB_ReceiveBuffer); call_count_HS_AppPipe = UT_GetStubCount(UT_KEY(HS_AppPipe)); @@ -1929,7 +1991,8 @@ void HS_ProcessCommands_Test(void) call_count_HS_MonitorEvent = UT_GetStubCount(UT_KEY(HS_MonitorEvent)); - UtAssert_True(call_count_HS_MonitorEvent == 1, "HS_MonitorEvent was called %u time(s), expected 1", + UtAssert_True(call_count_HS_MonitorEvent == 1, + "HS_MonitorEvent was called %u time(s), expected 1", call_count_HS_MonitorEvent); UtAssert_True(HS_AppData.CmdErrCount == 0, "HS_AppData.CmdErrCount == 0"); @@ -1969,7 +2032,8 @@ void HS_ProcessCommands_Test_NullMsgPtr(void) call_count_CFE_SB_ReceiveBuffer = UT_GetStubCount(UT_KEY(CFE_SB_ReceiveBuffer)); - UtAssert_True(call_count_CFE_SB_ReceiveBuffer == 4, "CFE_SB_ReceiveBuffer was called %u time(s), expected 4", + UtAssert_True(call_count_CFE_SB_ReceiveBuffer == 4, + "CFE_SB_ReceiveBuffer was called %u time(s), expected 4", call_count_CFE_SB_ReceiveBuffer); call_count_HS_AppPipe = UT_GetStubCount(UT_KEY(HS_AppPipe)); @@ -1984,80 +2048,136 @@ void HS_ProcessCommands_Test_NullMsgPtr(void) */ void UtTest_Setup(void) { - UtTest_Add(HS_AppMain_Test_NominalWaitForStartupSync, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppMain_Test_NominalWaitForStartupSync, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppMain_Test_NominalWaitForStartupSync"); - UtTest_Add(HS_AppMain_Test_NominalRcvMsgSuccess, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppMain_Test_NominalRcvMsgSuccess, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppMain_Test_NominalRcvMsgSuccess"); - UtTest_Add(HS_AppMain_Test_NominalRcvMsgNoMessage, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppMain_Test_NominalRcvMsgNoMessage, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppMain_Test_NominalRcvMsgNoMessage"); - UtTest_Add(HS_AppMain_Test_NominalRcvMsgTimeOut, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppMain_Test_NominalRcvMsgTimeOut, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppMain_Test_NominalRcvMsgTimeOut"); - UtTest_Add(HS_AppMain_Test_NominalRcvMsgError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppMain_Test_NominalRcvMsgError, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppMain_Test_NominalRcvMsgError"); UtTest_Add(HS_AppMain_Test_AppInitNotSuccess, HS_Test_Setup, HS_Test_TearDown, "HS_AppMain_Test_AppInitNotSuccess"); - UtTest_Add(HS_AppMain_Test_ProcessMainNotSuccess, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppMain_Test_ProcessMainNotSuccess, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppMain_Test_ProcessMainNotSuccess"); - UtTest_Add(HS_AppMain_Test_SBSubscribeEVSLongError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppMain_Test_SBSubscribeEVSLongError, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppMain_Test_SBSubscribeEVSLongError"); - UtTest_Add(HS_AppMain_Test_SBSubscribeEVSShortError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppMain_Test_SBSubscribeEVSShortError, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppMain_Test_SBSubscribeEVSShortError"); UtTest_Add(HS_AppMain_Test_RcvMsgError, HS_Test_Setup, HS_Test_TearDown, "HS_AppMain_Test_RcvMsgError"); UtTest_Add(HS_AppMain_Test_StateDisabled, HS_Test_Setup, HS_Test_TearDown, "HS_AppMain_Test_StateDisabled"); UtTest_Add(HS_AppInit_Test_EVSRegisterError, HS_Test_Setup, HS_Test_TearDown, "HS_AppInit_Test_EVSRegisterError"); UtTest_Add(HS_AppInit_Test_Nominal, HS_Test_Setup, HS_Test_TearDown, "HS_AppInit_Test_Nominal"); - UtTest_Add(HS_AppInit_Test_CorruptCDSResetsPerformed, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppInit_Test_CorruptCDSResetsPerformed, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppInit_Test_CorruptCDSResetsPerformed"); - UtTest_Add(HS_AppInit_Test_CorruptCDSMaxResets, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppInit_Test_CorruptCDSMaxResets, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppInit_Test_CorruptCDSMaxResets"); UtTest_Add(HS_AppInit_Test_CorruptCDSNoEvent, HS_Test_Setup, HS_Test_TearDown, "HS_AppInit_Test_CorruptCDSNoEvent"); UtTest_Add(HS_AppInit_Test_RestoreCDSError, HS_Test_Setup, HS_Test_TearDown, "HS_AppInit_Test_RestoreCDSError"); - UtTest_Add(HS_AppInit_Test_DisableSavingToCDS, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppInit_Test_DisableSavingToCDS, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppInit_Test_DisableSavingToCDS"); UtTest_Add(HS_AppInit_Test_SBInitError, HS_Test_Setup, HS_Test_TearDown, "HS_AppInit_Test_SBInitError"); UtTest_Add(HS_AppInit_Test_TblInitError, HS_Test_Setup, HS_Test_TearDown, "HS_AppInit_Test_TblInitError"); UtTest_Add(HS_AppInit_Test_CustomInitError, HS_Test_Setup, HS_Test_TearDown, "HS_AppInit_Test_CustomInitError"); UtTest_Add(HS_SbInit_Test_Nominal, HS_Test_Setup, HS_Test_TearDown, "HS_SbInit_Test_Nominal"); - UtTest_Add(HS_SbInit_Test_CreateSBCmdPipeError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SbInit_Test_CreateSBCmdPipeError, + HS_Test_Setup, + HS_Test_TearDown, "HS_SbInit_Test_CreateSBCmdPipeError"); - UtTest_Add(HS_SbInit_Test_CreateSBEventPipeError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SbInit_Test_CreateSBEventPipeError, + HS_Test_Setup, + HS_Test_TearDown, "HS_SbInit_Test_CreateSBEventPipeError"); UtTest_Add(HS_SbInit_Test_CreateSBWakeupPipe, HS_Test_Setup, HS_Test_TearDown, "HS_SbInit_Test_CreateSBWakeupPipe"); - UtTest_Add(HS_SbInit_Test_SubscribeHKRequestError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SbInit_Test_SubscribeHKRequestError, + HS_Test_Setup, + HS_Test_TearDown, "HS_SbInit_Test_SubscribeHKRequestError"); - UtTest_Add(HS_SbInit_Test_SubscribeGndCmdsError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SbInit_Test_SubscribeGndCmdsError, + HS_Test_Setup, + HS_Test_TearDown, "HS_SbInit_Test_SubscribeGndCmdsError"); - UtTest_Add(HS_SbInit_Test_SubscribeWakeupError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SbInit_Test_SubscribeWakeupError, + HS_Test_Setup, + HS_Test_TearDown, "HS_SbInit_Test_SubscribeWakeupError"); UtTest_Add(HS_TblInit_Test_Nominal, HS_Test_Setup, HS_Test_TearDown, "HS_TblInit_Test_Nominal"); - UtTest_Add(HS_TblInit_Test_RegisterAppMonTableError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_TblInit_Test_RegisterAppMonTableError, + HS_Test_Setup, + HS_Test_TearDown, "HS_TblInit_Test_RegisterAppMonTableError"); - UtTest_Add(HS_TblInit_Test_RegisterEventMonTableError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_TblInit_Test_RegisterEventMonTableError, + HS_Test_Setup, + HS_Test_TearDown, "HS_TblInit_Test_RegisterEventMonTableError"); - UtTest_Add(HS_TblInit_Test_RegisterMsgActsTableError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_TblInit_Test_RegisterMsgActsTableError, + HS_Test_Setup, + HS_Test_TearDown, "HS_TblInit_Test_RegisterMsgActsTableError"); - UtTest_Add(HS_TblInit_Test_RegisterExeCountTableError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_TblInit_Test_RegisterExeCountTableError, + HS_Test_Setup, + HS_Test_TearDown, "HS_TblInit_Test_RegisterExeCountTableError"); - UtTest_Add(HS_TblInit_Test_LoadExeCountTableError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_TblInit_Test_LoadExeCountTableError, + HS_Test_Setup, + HS_Test_TearDown, "HS_TblInit_Test_LoadExeCountTableError"); - UtTest_Add(HS_TblInit_Test_LoadAppMonTableError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_TblInit_Test_LoadAppMonTableError, + HS_Test_Setup, + HS_Test_TearDown, "HS_TblInit_Test_LoadAppMonTableError"); - UtTest_Add(HS_TblInit_Test_LoadEventMonTableError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_TblInit_Test_LoadEventMonTableError, + HS_Test_Setup, + HS_Test_TearDown, "HS_TblInit_Test_LoadEventMonTableError"); - UtTest_Add(HS_TblInit_Test_LoadMsgActsTableError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_TblInit_Test_LoadMsgActsTableError, + HS_Test_Setup, + HS_Test_TearDown, "HS_TblInit_Test_LoadMsgActsTableError"); UtTest_Add(HS_ProcessMain_Test, HS_Test_Setup, HS_Test_TearDown, "HS_ProcessMain_Test"); - UtTest_Add(HS_ProcessMain_Test_MonStateDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ProcessMain_Test_MonStateDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_ProcessMain_Test_MonStateDisabled"); - UtTest_Add(HS_ProcessMain_Test_AlivenessDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ProcessMain_Test_AlivenessDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_ProcessMain_Test_AlivenessDisabled"); - UtTest_Add(HS_ProcessMain_Test_WatchdogDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ProcessMain_Test_WatchdogDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_ProcessMain_Test_WatchdogDisabled"); UtTest_Add(HS_ProcessCommands_Test, HS_Test_Setup, HS_Test_TearDown, "HS_ProcessCommands_Test"); - UtTest_Add(HS_ProcessCommands_Test_NullMsgPtr, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ProcessCommands_Test_NullMsgPtr, + HS_Test_Setup, + HS_Test_TearDown, "HS_ProcessCommands_Test_NullMsgPtr"); } diff --git a/unit-test/hs_cmds_tests.c b/unit-test/hs_cmds_tests.c index d421877..6447d7c 100644 --- a/unit-test/hs_cmds_tests.c +++ b/unit-test/hs_cmds_tests.c @@ -36,12 +36,15 @@ /* hs_cmds_tests globals */ uint8 call_count_CFE_EVS_SendEvent; +uint8 call_count_CFE_ES_GetAppIDByName; /* * Function Definitions */ -int32 HS_CMDS_TEST_CFE_ES_GetTaskInfoHook(void *UserObj, int32 StubRetcode, uint32 CallCount, +int32 HS_CMDS_TEST_CFE_ES_GetTaskInfoHook(void *UserObj, + int32 StubRetcode, + uint32 CallCount, const UT_StubContext_t *Context) { CFE_ES_TaskInfo_t *TaskInfo = UserObj; @@ -115,21 +118,94 @@ void HS_SendHkCmd_Test_InvalidEventMon(void) /* Check first, middle, and last element */ UtAssert_True(PayloadPtr->AppMonEnables[0] == 0, "PayloadPtr->AppMonEnables[0] == 0"); - UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] == - ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, + UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] + == ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE) / 2] == ((HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE) / 2"); - UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] == - (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, + UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] + == (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE] == (HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } +void HS_SendHkCmd_Test_NullEventMonTable(void) +{ + CFE_SB_MsgId_t TestMsgId; + CFE_MSG_FcnCode_t FcnCode; + size_t MsgSize; + uint32 TableIndex; + HS_HkTlm_Payload_t *PayloadPtr; + + /* setting this to null should prevent UUT from incrementing InvalidEventMonCount */ + HS_AppData.EMTablePtr = NULL; + + TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); + FcnCode = HS_ENABLE_EVENT_MON_CC; + MsgSize = sizeof(UT_CmdBuf.EnableEventMonCmd); + + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); + + /* Fail first, succeed on second (shouldn't get called, but set up anyway)*/ + UT_SetDeferredRetcode(UT_KEY(CFE_ES_GetAppIDByName), 1, -1); + + /* initialize hk counters */ + HS_AppData.CmdCount = 1; + HS_AppData.CmdErrCount = 2; + HS_AppData.CurrentAppMonState = 3; + HS_AppData.CurrentEventMonState = 4; + HS_AppData.CurrentAlivenessState = 5; + HS_AppData.CurrentCPUHogState = 6; + HS_AppData.CDSData.ResetsPerformed = 7; + HS_AppData.CDSData.MaxResets = 8; + HS_AppData.EventsMonitoredCount = 9; + HS_AppData.MsgActExec = 10; + + for (TableIndex = 0; TableIndex <= ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE); TableIndex++) + { + HS_AppData.AppMonEnables[TableIndex] = TableIndex; + } + + /* Execute the function being tested */ + HS_SendHkCmd(&UT_CmdBuf.SendHkCmd); + + /* Verify general housekeeping fields weren't affected */ + PayloadPtr = &HS_AppData.HkPacket.Payload; + UtAssert_UINT8_EQ(PayloadPtr->CmdCount, 1); + UtAssert_UINT8_EQ(PayloadPtr->CmdErrCount, 2); + UtAssert_UINT8_EQ(PayloadPtr->CurrentAppMonState, 3); + UtAssert_UINT8_EQ(PayloadPtr->CurrentEventMonState, 4); + UtAssert_UINT8_EQ(PayloadPtr->CurrentAlivenessState, 5); + UtAssert_UINT8_EQ(PayloadPtr->CurrentCPUHogState, 6); + UtAssert_UINT16_EQ(PayloadPtr->ResetsPerformed, 7); + UtAssert_UINT16_EQ(PayloadPtr->MaxResets, 8); + UtAssert_UINT32_EQ(PayloadPtr->EventsMonitoredCount, 9); + UtAssert_UINT32_EQ(PayloadPtr->MsgActExec, 10); + + /* if InvalidEventMonCount was incremented, we did something wrong */ + UtAssert_UINT32_EQ(PayloadPtr->InvalidEventMonCount, 0); + + /* Check first, middle, and last element */ + UtAssert_UINT32_EQ(PayloadPtr->AppMonEnables[0], 0); + UtAssert_UINT32_EQ(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2], + ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2); + UtAssert_UINT32_EQ(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE], + (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE); + + call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); + UtAssert_UINT8_EQ(call_count_CFE_EVS_SendEvent, 0); + + call_count_CFE_ES_GetAppIDByName = UT_GetStubCount(UT_KEY(CFE_ES_GetAppIDByName)); + UtAssert_UINT8_EQ(call_count_CFE_ES_GetAppIDByName, 0); +} + void HS_SendHkCmd_Test_AllFlagsEnabled(void) { CFE_SB_MsgId_t TestMsgId; @@ -207,21 +283,83 @@ void HS_SendHkCmd_Test_AllFlagsEnabled(void) /* Check first, middle, and last element */ UtAssert_True(PayloadPtr->AppMonEnables[0] == 0, "PayloadPtr->AppMonEnables[0] == 0"); - UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] == - ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, + UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] + == ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE) / 2] == ((HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE) / 2"); - UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] == - (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, + UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] + == (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE] == (HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } +void HS_SendHkCmd_Test_XCTablePtrNull(void) +{ + int i; + + /* + ** initialize app data to inject error scenario + ** normally, XCTablePtr gets iniitalized during the table load (at app init) + */ + HS_AppData.XCTablePtr = NULL; + HS_AppData.ExeCountState = HS_State_ENABLED; + + /* Execute the function being tested */ + HS_SendHkCmd(&UT_CmdBuf.SendHkCmd); + + /* + ** Check that each Execution Counter was set to invalid, + ** since the XCT pointer was null + ** If the expected UUT lines weren't executed, + ** these values would likely be zero from the test case setup + */ + for (i = 0; i < HS_MAX_EXEC_CNT_SLOTS; i++) + { + UtAssert_UINT32_EQ(HS_AppData.HkPacket.Payload.ExeCounts[i], HS_INVALID_EXECOUNT); + } + + /* Check that these stubs weren't called */ + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_GetTaskInfo)), 0); +} + +void HS_SendHkCmd_Test_XCTablePtrNullAndDisabled(void) +{ + int i; + + /* + ** initialize app data to inject error scenario + ** normally, XCTablePtr gets iniitalized during the table load (at app init) + ** and when that's success + */ + HS_AppData.XCTablePtr = NULL; + HS_AppData.ExeCountState = HS_State_DISABLED; + + /* Execute the function being tested */ + HS_SendHkCmd(&UT_CmdBuf.SendHkCmd); + + /* + ** Check that each Execution Counter was set to invalid, + ** since the XCT pointer was null + ** If the expected UUT lines weren't executed, + ** these values would likely be zero from the test case setup + */ + for (i = 0; i < HS_MAX_EXEC_CNT_SLOTS; i++) + { + UtAssert_UINT32_EQ(HS_AppData.HkPacket.Payload.ExeCounts[i], HS_INVALID_EXECOUNT); + } + + /* Check that these stubs weren't called */ + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_GetTaskInfo)), 0); +} + void HS_SendHkCmd_Test_ResourceTypeAppMain(void) { CFE_SB_MsgId_t TestMsgId; @@ -303,20 +441,21 @@ void HS_SendHkCmd_Test_ResourceTypeAppMain(void) /* Check first, middle, and last element */ UtAssert_True(PayloadPtr->AppMonEnables[0] == 0, "PayloadPtr->AppMonEnables[0] == 0"); - UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] == - ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, + UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] + == ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE) / 2] == ((HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE) / 2"); - UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] == - (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, + UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] + == (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE] == (HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE"); UtAssert_True(PayloadPtr->ExeCounts[0] == 5, "PayloadPtr->ExeCounts[0] == 5"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -400,20 +539,21 @@ void HS_SendHkCmd_Test_ResourceTypeAppChild(void) /* Check first, middle, and last element */ UtAssert_True(PayloadPtr->AppMonEnables[0] == 0, "PayloadPtr->AppMonEnables[0] == 0"); - UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] == - ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, + UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] + == ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE) / 2] == ((HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE) / 2"); - UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] == - (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, + UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] + == (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE] == (HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE"); UtAssert_True(PayloadPtr->ExeCounts[0] == 5, "PayloadPtr->ExeCounts[0] == 5"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -498,20 +638,21 @@ void HS_SendHkCmd_Test_ResourceTypeAppChildTaskIdError(void) /* Check first, middle, and last element */ UtAssert_True(PayloadPtr->AppMonEnables[0] == 0, "PayloadPtr->AppMonEnables[0] == 0"); - UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] == - ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, + UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] + == ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE) / 2] == ((HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE) / 2"); - UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] == - (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, + UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] + == (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE] == (HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE"); UtAssert_True(PayloadPtr->ExeCounts[0] == HS_INVALID_EXECOUNT, "PayloadPtr->ExeCounts[0] == HS_INVALID_EXECOUNT"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -592,20 +733,21 @@ void HS_SendHkCmd_Test_ResourceTypeAppChildTaskInfoError(void) /* Check first, middle, and last element */ UtAssert_True(PayloadPtr->AppMonEnables[0] == 0, "PayloadPtr->AppMonEnables[0] == 0"); - UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] == - ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, + UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] + == ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE) / 2] == ((HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE) / 2"); - UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] == - (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, + UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] + == (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE] == (HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE"); UtAssert_True(PayloadPtr->ExeCounts[0] == HS_INVALID_EXECOUNT, "PayloadPtr->ExeCounts[0] == HS_INVALID_EXECOUNT"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -687,20 +829,21 @@ void HS_SendHkCmd_Test_ResourceTypeDevice(void) /* Check first, middle, and last element */ UtAssert_True(PayloadPtr->AppMonEnables[0] == 0, "PayloadPtr->AppMonEnables[0] == 0"); - UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] == - ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, + UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] + == ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE) / 2] == ((HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE) / 2"); - UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] == - (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, + UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] + == (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE] == (HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE"); UtAssert_True(PayloadPtr->ExeCounts[0] == HS_INVALID_EXECOUNT, "PayloadPtr->ExeCounts[0] == HS_INVALID_EXECOUNT"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -775,20 +918,21 @@ void HS_SendHkCmd_Test_ResourceTypeISR(void) /* Check first, middle, and last element */ UtAssert_True(PayloadPtr->AppMonEnables[0] == 0, "PayloadPtr->AppMonEnables[0] == 0"); - UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] == - ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, + UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] + == ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE) / 2] == ((HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE) / 2"); - UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] == - (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, + UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] + == (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE] == (HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE"); UtAssert_True(PayloadPtr->ExeCounts[0] == HS_INVALID_EXECOUNT, "PayloadPtr->ExeCounts[0] == HS_INVALID_EXECOUNT"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -866,20 +1010,21 @@ void HS_SendHkCmd_Test_ResourceTypeISRGenCounterError(void) /* Check first, middle, and last element */ UtAssert_True(PayloadPtr->AppMonEnables[0] == 0, "PayloadPtr->AppMonEnables[0] == 0"); - UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] == - ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, + UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] + == ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE) / 2] == ((HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE) / 2"); - UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] == - (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, + UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] + == (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE] == (HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE"); UtAssert_True(PayloadPtr->ExeCounts[0] == HS_INVALID_EXECOUNT, "PayloadPtr->ExeCounts[0] == HS_INVALID_EXECOUNT"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -961,18 +1106,19 @@ void HS_SendHkCmd_Test_ResourceTypeUnknown(void) /* Check first, middle, and last element */ UtAssert_True(PayloadPtr->AppMonEnables[0] == 0, "PayloadPtr->AppMonEnables[0] == 0"); - UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] == - ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, + UtAssert_True(PayloadPtr->AppMonEnables[((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2] + == ((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE) / 2, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE) / 2] == ((HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE) / 2"); - UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] == - (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, + UtAssert_True(PayloadPtr->AppMonEnables[(HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE] + == (HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE, "((HS_MAX_MONITORED_APPS -1) / HS_BITS_PER_APPMON_ENABLE] == (HS_MAX_MONITORED_APPS -1) / " "HS_BITS_PER_APPMON_ENABLE"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 32, "CFE_EVS_SendEvent was called %u time(s), expected 32", + UtAssert_True(call_count_CFE_EVS_SendEvent == 32, + "CFE_EVS_SendEvent was called %u time(s), expected 32", call_count_CFE_EVS_SendEvent); } @@ -1007,7 +1153,8 @@ void HS_Noop_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1042,7 +1189,8 @@ void HS_ResetCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1058,7 +1206,8 @@ void HS_ResetCounters_Test(void) UtAssert_True(HS_AppData.MsgActExec == 0, "HS_AppData.MsgActExec == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1104,7 +1253,8 @@ void HS_EnableAppMonCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1150,7 +1300,8 @@ void HS_EnableAppMonCmd_Test_AlreadyEnabled(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1191,7 +1342,8 @@ void HS_DisableAppMonCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1202,7 +1354,8 @@ void HS_DisableAppMonCmd_Test_AlreadyDisabled(void) size_t MsgSize; int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Application Monitoring is *already* Disabled"); TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); @@ -1233,7 +1386,8 @@ void HS_DisableAppMonCmd_Test_AlreadyDisabled(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1273,7 +1427,8 @@ void HS_EnableEventMonCmd_Test_Disabled(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1313,7 +1468,8 @@ void HS_EnableEventMonCmd_Test_AlreadyEnabled(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1324,7 +1480,8 @@ void HS_EnableEventMonCmd_Test_SubscribeLongError(void) size_t MsgSize; int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitor Enable: Error Subscribing to long-format Events,RC=0x%%08X"); TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); @@ -1356,7 +1513,8 @@ void HS_EnableEventMonCmd_Test_SubscribeLongError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1367,7 +1525,8 @@ void HS_EnableEventMonCmd_Test_SubscribeShortError(void) size_t MsgSize; int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitor Enable: Error Subscribing to short-format Events,RC=0x%%08X"); TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); @@ -1399,7 +1558,8 @@ void HS_EnableEventMonCmd_Test_SubscribeShortError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1439,7 +1599,8 @@ void HS_DisableEventMonCmd_Test_Enabled(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1479,7 +1640,8 @@ void HS_DisableEventMonCmd_Test_AlreadyDisabled(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1490,7 +1652,8 @@ void HS_DisableEventMonCmd_Test_UnsubscribeLongError(void) size_t MsgSize; int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitor Disable: Error Unsubscribing from long-format Events,RC=0x%%08X"); TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); @@ -1522,7 +1685,8 @@ void HS_DisableEventMonCmd_Test_UnsubscribeLongError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1533,7 +1697,8 @@ void HS_DisableEventMonCmd_Test_UnsubscribeShortError(void) size_t MsgSize; int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitor Disable: Error Unsubscribing from short-format Events,RC=0x%%08X"); TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); @@ -1565,7 +1730,8 @@ void HS_DisableEventMonCmd_Test_UnsubscribeShortError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1605,7 +1771,8 @@ void HS_EnableAlivenessCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1645,7 +1812,8 @@ void HS_EnableAlivenessCmd_Test_AlreadyEnabled(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1685,7 +1853,8 @@ void HS_DisableAlivenessCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1725,7 +1894,8 @@ void HS_DisableAlivenessCmd_Test_AlreadyDisabled(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1765,7 +1935,8 @@ void HS_EnableCpuHogCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1805,7 +1976,8 @@ void HS_EnableCpuHogCmd_Test_AlreadyEnabled(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1845,7 +2017,8 @@ void HS_DisableCpuHogCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1885,7 +2058,8 @@ void HS_DisableCpuHogCmd_Test_AlreadyDisabled(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1896,7 +2070,8 @@ void HS_ResetResetsPerformedCmd_Test(void) size_t MsgSize; int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Processor Resets Performed by HS Counter has been Reset"); TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); @@ -1921,7 +2096,8 @@ void HS_ResetResetsPerformedCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1935,7 +2111,8 @@ void HS_SetMaxResetsCmd_Test(void) HS_SetMaxResets_Payload_t *PayloadPtr; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Max Resets Performable by HS has been set to %%d"); TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); @@ -1964,7 +2141,8 @@ void HS_SetMaxResetsCmd_Test(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2002,7 +2180,8 @@ void HS_AcquirePointers_Test_Nominal(void) UtAssert_True(HS_AppData.ExeCountState == HS_State_ENABLED, "HS_AppData.ExeCountState == HS_State_ENABLED"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -2010,13 +2189,17 @@ void HS_AcquirePointers_Test_ErrorsWithAppMonLoadedAndEventMonLoadedEnabled(void { int32 strCmpResult; char ExpectedEventString[4][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting AppMon Table address, RC=0x%%08X, Application Monitoring Disabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting EventMon Table address, RC=0x%%08X, Event Monitoring Disabled"); - snprintf(ExpectedEventString[2], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[2], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting MsgActs Table address, RC=0x%%08X"); - snprintf(ExpectedEventString[3], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[3], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting ExeCount Table address, RC=0x%%08X"); HS_AppData.AppMonLoaded = HS_State_ENABLED; @@ -2075,7 +2258,8 @@ void HS_AcquirePointers_Test_ErrorsWithAppMonLoadedAndEventMonLoadedEnabled(void UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[3].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 4, "CFE_EVS_SendEvent was called %u time(s), expected 4", + UtAssert_True(call_count_CFE_EVS_SendEvent == 4, + "CFE_EVS_SendEvent was called %u time(s), expected 4", call_count_CFE_EVS_SendEvent); } @@ -2083,15 +2267,20 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled2(v { int32 strCmpResult; char ExpectedEventString[5][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting AppMon Table address, RC=0x%%08X, Application Monitoring Disabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting EventMon Table address, RC=0x%%08X, Event Monitoring Disabled"); - snprintf(ExpectedEventString[2], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[2], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error Unsubscribing from short-format Events,RC=0x%%08X"); - snprintf(ExpectedEventString[3], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[3], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting MsgActs Table address, RC=0x%%08X"); - snprintf(ExpectedEventString[4], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[4], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting ExeCount Table address, RC=0x%%08X"); HS_AppData.AppMonLoaded = HS_State_DISABLED; @@ -2161,7 +2350,8 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled2(v UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[4].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 5, "CFE_EVS_SendEvent was called %u time(s), expected 5", + UtAssert_True(call_count_CFE_EVS_SendEvent == 5, + "CFE_EVS_SendEvent was called %u time(s), expected 5", call_count_CFE_EVS_SendEvent); } @@ -2169,15 +2359,20 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled(vo { int32 strCmpResult; char ExpectedEventString[5][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting AppMon Table address, RC=0x%%08X, Application Monitoring Disabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting EventMon Table address, RC=0x%%08X, Event Monitoring Disabled"); - snprintf(ExpectedEventString[2], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[2], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error Unsubscribing from long-format Events,RC=0x%%08X"); - snprintf(ExpectedEventString[3], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[3], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting MsgActs Table address, RC=0x%%08X"); - snprintf(ExpectedEventString[4], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[4], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error getting ExeCount Table address, RC=0x%%08X"); HS_AppData.AppMonLoaded = HS_State_DISABLED; @@ -2247,7 +2442,8 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled(vo UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[4].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 5, "CFE_EVS_SendEvent was called %u time(s), expected 5", + UtAssert_True(call_count_CFE_EVS_SendEvent == 5, + "CFE_EVS_SendEvent was called %u time(s), expected 5", call_count_CFE_EVS_SendEvent); } @@ -2289,7 +2485,8 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabledNoS UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[2].EventType, CFE_EVS_EventType_ERROR); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 3, "CFE_EVS_SendEvent was called %u time(s), expected 3", + UtAssert_True(call_count_CFE_EVS_SendEvent == 3, + "CFE_EVS_SendEvent was called %u time(s), expected 3", call_count_CFE_EVS_SendEvent); } @@ -2331,7 +2528,8 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabledNoS UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[2].EventType, CFE_EVS_EventType_ERROR); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 3, "CFE_EVS_SendEvent was called %u time(s), expected 3", + UtAssert_True(call_count_CFE_EVS_SendEvent == 3, + "CFE_EVS_SendEvent was called %u time(s), expected 3", call_count_CFE_EVS_SendEvent); } @@ -2368,7 +2566,8 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonLoadedDisabledAndCurrentAppM UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2415,7 +2614,8 @@ void HS_AppMonStatusRefresh_Test_CycleCountZero(void) UtAssert_UINT16_EQ(HS_AppData.AppMonCheckInCountdown[HS_MAX_MONITORED_APPS - 1], 0); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -2463,7 +2663,8 @@ void HS_AppMonStatusRefresh_Test_ActionTypeNOACT(void) UtAssert_UINT16_EQ(HS_AppData.AppMonCheckInCountdown[HS_MAX_MONITORED_APPS - 1], 0); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -2514,7 +2715,8 @@ void HS_AppMonStatusRefresh_Test_ElseCase(void) "HS_AppData.AppMonEnables[(((HS_MAX_MONITORED_APPS - 1) / HS_BITS_PER_APPMON_ENABLE)+1) - 1] == 0xFFFFFFFF"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -2542,7 +2744,8 @@ void HS_MsgActsStatusRefresh_Test(void) } call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -2552,22 +2755,45 @@ void HS_MsgActsStatusRefresh_Test(void) void UtTest_Setup(void) { UtTest_Add(HS_SendHkCmd_Test_InvalidEventMon, HS_Test_Setup, HS_Test_TearDown, "HS_SendHkCmd_Test_InvalidEventMon"); + UtTest_Add(HS_SendHkCmd_Test_NullEventMonTable, + HS_Test_Setup, + HS_Test_TearDown, + "HS_SendHkCmd_Test_NullEventMonTable"); UtTest_Add(HS_SendHkCmd_Test_AllFlagsEnabled, HS_Test_Setup, HS_Test_TearDown, "HS_SendHkCmd_Test_AllFlagsEnabled"); - UtTest_Add(HS_SendHkCmd_Test_ResourceTypeAppMain, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SendHkCmd_Test_XCTablePtrNull, HS_Test_Setup, HS_Test_TearDown, "HS_SendHkCmd_Test_XCTablePtrNull"); + UtTest_Add(HS_SendHkCmd_Test_XCTablePtrNullAndDisabled, + HS_Test_Setup, + HS_Test_TearDown, + "HS_SendHkCmd_Test_XCTablePtrNullAndDisabled"); + UtTest_Add(HS_SendHkCmd_Test_ResourceTypeAppMain, + HS_Test_Setup, + HS_Test_TearDown, "HS_SendHkCmd_Test_ResourceTypeAppMain"); - UtTest_Add(HS_SendHkCmd_Test_ResourceTypeAppChild, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SendHkCmd_Test_ResourceTypeAppChild, + HS_Test_Setup, + HS_Test_TearDown, "HS_SendHkCmd_Test_ResourceTypeAppChild"); - UtTest_Add(HS_SendHkCmd_Test_ResourceTypeAppChildTaskIdError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SendHkCmd_Test_ResourceTypeAppChildTaskIdError, + HS_Test_Setup, + HS_Test_TearDown, "HS_SendHkCmd_Test_ResourceTypeAppChildTaskIdError"); - UtTest_Add(HS_SendHkCmd_Test_ResourceTypeAppChildTaskInfoError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SendHkCmd_Test_ResourceTypeAppChildTaskInfoError, + HS_Test_Setup, + HS_Test_TearDown, "HS_SendHkCmd_Test_ResourceTypeAppChildTaskInfoError"); - UtTest_Add(HS_SendHkCmd_Test_ResourceTypeDevice, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SendHkCmd_Test_ResourceTypeDevice, + HS_Test_Setup, + HS_Test_TearDown, "HS_SendHkCmd_Test_ResourceTypeDevice"); UtTest_Add(HS_SendHkCmd_Test_ResourceTypeISR, HS_Test_Setup, HS_Test_TearDown, "HS_SendHkCmd_Test_ResourceTypeISR"); - UtTest_Add(HS_SendHkCmd_Test_ResourceTypeISRGenCounterError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SendHkCmd_Test_ResourceTypeISRGenCounterError, + HS_Test_Setup, + HS_Test_TearDown, "HS_SendHkCmd_Test_ResourceTypeISRGenCounterError"); - UtTest_Add(HS_SendHkCmd_Test_ResourceTypeUnknown, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_SendHkCmd_Test_ResourceTypeUnknown, + HS_Test_Setup, + HS_Test_TearDown, "HS_SendHkCmd_Test_ResourceTypeAppMain"); UtTest_Add(HS_Noop_Test, HS_Test_Setup, HS_Test_TearDown, "HS_Noop_Test"); @@ -2577,51 +2803,79 @@ void UtTest_Setup(void) UtTest_Add(HS_EnableAppMonCmd_Test, HS_Test_Setup, HS_Test_TearDown, "HS_EnableAppMonCmd_Test"); - UtTest_Add(HS_EnableAppMonCmd_Test_AlreadyEnabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_EnableAppMonCmd_Test_AlreadyEnabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_EnableAppMonCmd_Test_AlreadyEnabled"); UtTest_Add(HS_DisableAppMonCmd_Test, HS_Test_Setup, HS_Test_TearDown, "HS_DisableAppMonCmd_Test"); - UtTest_Add(HS_DisableAppMonCmd_Test_AlreadyDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_DisableAppMonCmd_Test_AlreadyDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_DisableAppMonCmd_Test_AlreadyDisabled"); - UtTest_Add(HS_EnableEventMonCmd_Test_Disabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_EnableEventMonCmd_Test_Disabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_EnableEventMonCmd_Test_Disabled"); - UtTest_Add(HS_EnableEventMonCmd_Test_AlreadyEnabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_EnableEventMonCmd_Test_AlreadyEnabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_EnableEventMonCmd_Test_AlreadyEnabled"); - UtTest_Add(HS_EnableEventMonCmd_Test_SubscribeLongError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_EnableEventMonCmd_Test_SubscribeLongError, + HS_Test_Setup, + HS_Test_TearDown, "HS_EnableEventMonCmd_Test_SubscribeLongError"); - UtTest_Add(HS_EnableEventMonCmd_Test_SubscribeShortError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_EnableEventMonCmd_Test_SubscribeShortError, + HS_Test_Setup, + HS_Test_TearDown, "HS_EnableEventMonCmd_Test_SubscribeShortError"); - UtTest_Add(HS_DisableEventMonCmd_Test_Enabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_DisableEventMonCmd_Test_Enabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_DisableEventMonCmd_Test_Enabled"); - UtTest_Add(HS_DisableEventMonCmd_Test_AlreadyDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_DisableEventMonCmd_Test_AlreadyDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_DisableEventMonCmd_Test_AlreadyDisabled"); - UtTest_Add(HS_DisableEventMonCmd_Test_UnsubscribeLongError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_DisableEventMonCmd_Test_UnsubscribeLongError, + HS_Test_Setup, + HS_Test_TearDown, "HS_DisableEventMonCmd_Test_UnsubscribeLongError"); - UtTest_Add(HS_DisableEventMonCmd_Test_UnsubscribeShortError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_DisableEventMonCmd_Test_UnsubscribeShortError, + HS_Test_Setup, + HS_Test_TearDown, "HS_DisableEventMonCmd_Test_UnsubscribeShortError"); UtTest_Add(HS_EnableAlivenessCmd_Test, HS_Test_Setup, HS_Test_TearDown, "HS_EnableAlivenessCmd_Test"); - UtTest_Add(HS_EnableAlivenessCmd_Test_AlreadyEnabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_EnableAlivenessCmd_Test_AlreadyEnabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_EnableAlivenessCmd_Test_AlreadyEnabled"); UtTest_Add(HS_DisableAlivenessCmd_Test, HS_Test_Setup, HS_Test_TearDown, "HS_DisableAlivenessCmd_Test"); - UtTest_Add(HS_DisableAlivenessCmd_Test_AlreadyDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_DisableAlivenessCmd_Test_AlreadyDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_DisableAlivenessCmd_Test_AlreadyDisabled"); UtTest_Add(HS_EnableCpuHogCmd_Test, HS_Test_Setup, HS_Test_TearDown, "HS_EnableCpuHogCmd_Test"); - UtTest_Add(HS_EnableCpuHogCmd_Test_AlreadyEnabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_EnableCpuHogCmd_Test_AlreadyEnabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_EnableCpuHogCmd_Test_AlreadyEnabled"); UtTest_Add(HS_DisableCpuHogCmd_Test, HS_Test_Setup, HS_Test_TearDown, "HS_DisableCpuHogCmd_Test"); - UtTest_Add(HS_DisableCpuHogCmd_Test_AlreadyDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_DisableCpuHogCmd_Test_AlreadyDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_DisableCpuHogCmd_Test_AlreadyDisabled"); UtTest_Add(HS_ResetResetsPerformedCmd_Test, HS_Test_Setup, HS_Test_TearDown, "HS_ResetResetsPerformedCmd_Test"); @@ -2629,24 +2883,38 @@ void UtTest_Setup(void) UtTest_Add(HS_SetMaxResetsCmd_Test, HS_Test_Setup, HS_Test_TearDown, "HS_SetMaxResetsCmd_Test"); UtTest_Add(HS_AcquirePointers_Test_Nominal, HS_Test_Setup, HS_Test_TearDown, "HS_AcquirePointers_Test_Nominal"); - UtTest_Add(HS_AcquirePointers_Test_ErrorsWithAppMonLoadedAndEventMonLoadedEnabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AcquirePointers_Test_ErrorsWithAppMonLoadedAndEventMonLoadedEnabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_AcquirePointers_Test_ErrorsWithAppMonLoadedAndEventMonLoadedEnabled"); - UtTest_Add(HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled, HS_Test_Setup, - HS_Test_TearDown, "HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled"); - UtTest_Add(HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled2, HS_Test_Setup, - HS_Test_TearDown, "HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled2"); - UtTest_Add(HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabledNoSubscribeError, HS_Test_Setup, + UtTest_Add(HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled, + HS_Test_Setup, + HS_Test_TearDown, + "HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled"); + UtTest_Add(HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled2, + HS_Test_Setup, + HS_Test_TearDown, + "HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled2"); + UtTest_Add(HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabledNoSubscribeError, + HS_Test_Setup, HS_Test_TearDown, "HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabledNoSubscribeError"); UtTest_Add(HS_AcquirePointers_Test_ErrorsWithCurrentAppMonLoadedDisabledAndCurrentAppMonStateDisabled, - HS_Test_Setup, HS_Test_TearDown, + HS_Test_Setup, + HS_Test_TearDown, "HS_AcquirePointers_Test_ErrorsWithCurrentAppMonLoadedDisabledAndCurrentAppMonStateDisabled"); - UtTest_Add(HS_AppMonStatusRefresh_Test_CycleCountZero, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppMonStatusRefresh_Test_CycleCountZero, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppMonStatusRefresh_Test_CycleCountZero"); - UtTest_Add(HS_AppMonStatusRefresh_Test_ActionTypeNOACT, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppMonStatusRefresh_Test_ActionTypeNOACT, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppMonStatusRefresh_Test_ActionTypeNOACT"); - UtTest_Add(HS_AppMonStatusRefresh_Test_ElseCase, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppMonStatusRefresh_Test_ElseCase, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppMonStatusRefresh_Test_ElseCase"); UtTest_Add(HS_MsgActsStatusRefresh_Test, HS_Test_Setup, HS_Test_TearDown, "HS_MsgActsStatusRefresh_Test"); diff --git a/unit-test/hs_dispatch_tests.c b/unit-test/hs_dispatch_tests.c index 6101e98..3d2e932 100644 --- a/unit-test/hs_dispatch_tests.c +++ b/unit-test/hs_dispatch_tests.c @@ -41,9 +41,9 @@ static void HS_Dispatch_Test_SetupMsg(CFE_SB_MsgId_t MsgId, CFE_MSG_FcnCode_t FcnCode, size_t MsgSize) { /* Note some paths get the MsgId/FcnCode multiple times, so register accordingly, just in case */ - CFE_SB_MsgId_t RegMsgId[2] = {MsgId, MsgId}; - CFE_MSG_FcnCode_t RegFcnCode[2] = {FcnCode, FcnCode}; - size_t RegMsgSize[2] = {MsgSize, MsgSize}; + CFE_SB_MsgId_t RegMsgId[2] = { MsgId, MsgId }; + CFE_MSG_FcnCode_t RegFcnCode[2] = { FcnCode, FcnCode }; + size_t RegMsgSize[2] = { MsgSize, MsgSize }; UT_ResetState(UT_KEY(CFE_MSG_GetMsgId)); UT_ResetState(UT_KEY(CFE_MSG_GetFcnCode)); @@ -168,7 +168,8 @@ void HS_AppPipe_Test_EnableAppMon(void) void HS_AppPipe_Test_DisableAppMon(void) { - HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), HS_DISABLE_APP_MON_CC, + HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), + HS_DISABLE_APP_MON_CC, sizeof(UT_CmdBuf.DisableAppMonCmd)); /* Execute the function being tested */ @@ -187,7 +188,8 @@ void HS_AppPipe_Test_DisableAppMon(void) void HS_AppPipe_Test_EnableEventMon(void) { - HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), HS_ENABLE_EVENT_MON_CC, + HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), + HS_ENABLE_EVENT_MON_CC, sizeof(UT_CmdBuf.EnableEventMonCmd)); /* Execute the function being tested */ @@ -206,7 +208,8 @@ void HS_AppPipe_Test_EnableEventMon(void) void HS_AppPipe_Test_DisableEventMon(void) { - HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), HS_DISABLE_EVENT_MON_CC, + HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), + HS_DISABLE_EVENT_MON_CC, sizeof(UT_CmdBuf.DisableEventMonCmd)); /* Execute the function being tested */ @@ -225,7 +228,8 @@ void HS_AppPipe_Test_DisableEventMon(void) void HS_AppPipe_Test_EnableAliveness(void) { - HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), HS_ENABLE_ALIVENESS_CC, + HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), + HS_ENABLE_ALIVENESS_CC, sizeof(UT_CmdBuf.EnableAlivenessCmd)); /* Execute the function being tested */ @@ -244,7 +248,8 @@ void HS_AppPipe_Test_EnableAliveness(void) void HS_AppPipe_Test_DisableAliveness(void) { - HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), HS_DISABLE_ALIVENESS_CC, + HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), + HS_DISABLE_ALIVENESS_CC, sizeof(UT_CmdBuf.DisableAlivenessCmd)); /* Execute the function being tested */ @@ -263,7 +268,8 @@ void HS_AppPipe_Test_DisableAliveness(void) void HS_AppPipe_Test_ResetResetsPerformed(void) { - HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), HS_RESET_RESETS_PERFORMED_CC, + HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), + HS_RESET_RESETS_PERFORMED_CC, sizeof(UT_CmdBuf.ResetResetsPerformedCmd)); /* Execute the function being tested */ @@ -318,7 +324,8 @@ void HS_AppPipe_Test_EnableCPUHog(void) void HS_AppPipe_Test_DisableCPUHog(void) { - HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), HS_DISABLE_CPU_HOG_CC, + HS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(HS_CMD_MID), + HS_DISABLE_CPU_HOG_CC, sizeof(UT_CmdBuf.DisableCpuHogCmd)); /* Execute the function being tested */ @@ -379,7 +386,9 @@ void UtTest_Setup(void) UtTest_Add(HS_AppPipe_Test_DisableEventMon, HS_Test_Setup, HS_Test_TearDown, "HS_AppPipe_Test_DisableEventMon"); UtTest_Add(HS_AppPipe_Test_EnableAliveness, HS_Test_Setup, HS_Test_TearDown, "HS_AppPipe_Test_EnableAliveness"); UtTest_Add(HS_AppPipe_Test_DisableAliveness, HS_Test_Setup, HS_Test_TearDown, "HS_AppPipe_Test_DisableAliveness"); - UtTest_Add(HS_AppPipe_Test_ResetResetsPerformed, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_AppPipe_Test_ResetResetsPerformed, + HS_Test_Setup, + HS_Test_TearDown, "HS_AppPipe_Test_ResetResetsPerformed"); UtTest_Add(HS_AppPipe_Test_SetMaxResets, HS_Test_Setup, HS_Test_TearDown, "HS_AppPipe_Test_SetMaxResets"); UtTest_Add(HS_AppPipe_Test_EnableCPUHog, HS_Test_Setup, HS_Test_TearDown, "HS_AppPipe_Test_EnableCPUHog"); diff --git a/unit-test/hs_monitors_tests.c b/unit-test/hs_monitors_tests.c index 8c500d4..9b2f5f4 100644 --- a/unit-test/hs_monitors_tests.c +++ b/unit-test/hs_monitors_tests.c @@ -43,7 +43,9 @@ uint8 call_count_CFE_EVS_SendEvent; * Function Definitions */ -int32 HS_MONITORS_TEST_CFE_ES_GetAppInfoHook1(void *UserObj, int32 StubRetcode, uint32 CallCount, +int32 HS_MONITORS_TEST_CFE_ES_GetAppInfoHook1(void *UserObj, + int32 StubRetcode, + uint32 CallCount, const UT_StubContext_t *Context) { CFE_ES_AppInfo_t *AppInfo = UserObj; @@ -53,6 +55,26 @@ int32 HS_MONITORS_TEST_CFE_ES_GetAppInfoHook1(void *UserObj, int32 StubRetcode, return CFE_SUCCESS; } +void HS_MonitorApplications_Test_AppMonTblPtrNull(void) +{ + /* Execute the function being tested */ + HS_MonitorApplications(); + + /* + ** Verify UUT exited before processing app info from the table entries + ** Since the UUT simply returns during this, the best thing we can do is + ** verify that none of the stub functions were called + */ + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_GetAppIDByName)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_GetAppInfo)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(OS_TaskDelay)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_WriteToSysLog)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_ResetCFE)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_RestartApp)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_SB_TransmitMsg)), 0); +} + void HS_MonitorApplications_Test_AppNameNotFound(void) { HS_AMTEntry_t AMTable[HS_MAX_MONITORED_APPS]; @@ -90,7 +112,8 @@ void HS_MonitorApplications_Test_AppNameNotFound(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -119,7 +142,8 @@ void HS_MonitorApplications_Test_AppNameNotFoundDebugEvent(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -154,7 +178,8 @@ void HS_MonitorApplications_Test_GetExeCountFailure(void) UtAssert_True(HS_AppData.AppMonLastExeCount[0] == 0, "HS_AppData.AppMonLastExeCount[0] == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -168,9 +193,11 @@ void HS_MonitorApplications_Test_ProcessorResetError(void) memset(AMTable, 0, sizeof(AMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App Monitor Failure: APP:(%%s): Action: Processor Reset"); - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "HS App: App Monitor Failure: APP:(%%s): Action: Processor Reset\n"); HS_AppData.AMTablePtr = AMTable; @@ -195,7 +222,8 @@ void HS_MonitorApplications_Test_ProcessorResetError(void) HS_MonitorApplications(); /* Verify results */ - UtAssert_True(HS_AppData.AppMonCheckInCountdown[0] == 0, "HS_AppData.AppMonCheckInCountdown[0] == 0 %u", + UtAssert_True(HS_AppData.AppMonCheckInCountdown[0] == 0, + "HS_AppData.AppMonCheckInCountdown[0] == 0 %u", HS_AppData.AppMonCheckInCountdown[0]); UtAssert_UINT32_EQ(HS_AppData.AppMonEnables[0], 0); UtAssert_True(HS_AppData.ServiceWatchdogFlag == HS_State_DISABLED, @@ -210,7 +238,8 @@ void HS_MonitorApplications_Test_ProcessorResetError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -227,9 +256,11 @@ void HS_MonitorApplications_Test_ProcessorResetActionLimitError(void) memset(AMTable, 0, sizeof(AMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App Monitor Failure: APP:(%%s): Action: Processor Reset"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Processor Reset Action Limit Reached: No Reset Performed"); HS_AppData.AMTablePtr = AMTable; @@ -274,7 +305,8 @@ void HS_MonitorApplications_Test_ProcessorResetActionLimitError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -287,9 +319,11 @@ void HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoSuccess(void) memset(AMTable, 0, sizeof(AMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App Monitor Failure: APP:(%%s) Action: Restart Application"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Call to Restart App Failed: APP:(%%s) ERR: 0x%%08X"); HS_AppData.AMTablePtr = AMTable; @@ -335,7 +369,8 @@ void HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoSuccess(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -347,9 +382,11 @@ void HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoNotSuccess(void) memset(AMTable, 0, sizeof(AMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App Monitor Failure: APP:(%%s) Action: Restart Application"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Call to Restart App Failed: APP:(%%s) ERR: 0x%%08X"); HS_AppData.AMTablePtr = AMTable; @@ -392,7 +429,8 @@ void HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoNotSuccess(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -429,7 +467,8 @@ void HS_MonitorApplications_Test_RestartAppRestartSuccess(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -442,7 +481,8 @@ void HS_MonitorApplications_Test_FailError(void) memset(AMTable, 0, sizeof(AMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App Monitor Failure: APP:(%%s): Action: Event Only"); HS_AppData.AMTablePtr = AMTable; @@ -476,7 +516,8 @@ void HS_MonitorApplications_Test_FailError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -491,7 +532,8 @@ void HS_MonitorApplications_Test_MsgActsNOACT(void) HS_AppData.MATablePtr = &MATable[0]; - CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, CFE_SB_ValueToMsgId(HS_CMD_MID), + CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, + CFE_SB_ValueToMsgId(HS_CMD_MID), sizeof(HS_NoopCmd_t)); CFE_MSG_SetFcnCode((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, HS_NOOP_CC); @@ -523,7 +565,8 @@ void HS_MonitorApplications_Test_MsgActsNOACT(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -538,7 +581,8 @@ void HS_MonitorApplications_Test_MsgActsNOACTDisabled(void) HS_AppData.MATablePtr = &MATable[0]; - CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, CFE_SB_ValueToMsgId(HS_CMD_MID), + CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, + CFE_SB_ValueToMsgId(HS_CMD_MID), sizeof(HS_NoopCmd_t)); CFE_MSG_SetFcnCode((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, HS_NOOP_CC); @@ -570,7 +614,8 @@ void HS_MonitorApplications_Test_MsgActsNOACTDisabled(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -585,12 +630,14 @@ void HS_MonitorApplications_Test_MsgActsErrorDefault(void) memset(AMTable, 0, sizeof(AMTable)); memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App Monitor Failure: APP:(%%s): Action: Message Action Index: %%d"); HS_AppData.MATablePtr = &MATable[0]; - CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, CFE_SB_ValueToMsgId(HS_CMD_MID), + CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, + CFE_SB_ValueToMsgId(HS_CMD_MID), sizeof(HS_NoopCmd_t)); CFE_MSG_SetFcnCode((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, HS_NOOP_CC); @@ -634,7 +681,8 @@ void HS_MonitorApplications_Test_MsgActsErrorDefault(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -649,7 +697,8 @@ void HS_MonitorApplications_Test_MsgActsErrorDisabled(void) HS_AppData.MATablePtr = &MATable[0]; - CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, CFE_SB_ValueToMsgId(HS_CMD_MID), + CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, + CFE_SB_ValueToMsgId(HS_CMD_MID), sizeof(HS_NoopCmd_t)); CFE_MSG_SetFcnCode((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, HS_NOOP_CC); @@ -685,7 +734,8 @@ void HS_MonitorApplications_Test_MsgActsErrorDisabled(void) UtAssert_True(HS_AppData.MsgActCooldown[0] == 0, "HS_AppData.MsgActCooldown[0] == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -700,7 +750,8 @@ void HS_MonitorApplications_Test_MsgActsErrorDefaultCoolDown(void) HS_AppData.MATablePtr = &MATable[0]; - CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, CFE_SB_ValueToMsgId(HS_CMD_MID), + CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, + CFE_SB_ValueToMsgId(HS_CMD_MID), sizeof(HS_NoopCmd_t)); CFE_MSG_SetFcnCode((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, HS_NOOP_CC); @@ -736,7 +787,8 @@ void HS_MonitorApplications_Test_MsgActsErrorDefaultCoolDown(void) UtAssert_True(HS_AppData.MsgActCooldown[0] == 1, "HS_AppData.MsgActCooldown[0] == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -751,7 +803,8 @@ void HS_MonitorApplications_Test_MsgActsErrorDefaultDisabled(void) HS_AppData.MATablePtr = &MATable[0]; - CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, CFE_SB_ValueToMsgId(HS_CMD_MID), + CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, + CFE_SB_ValueToMsgId(HS_CMD_MID), sizeof(HS_NoopCmd_t)); CFE_MSG_SetFcnCode((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, HS_NOOP_CC); @@ -787,7 +840,8 @@ void HS_MonitorApplications_Test_MsgActsErrorDefaultDisabled(void) UtAssert_True(HS_AppData.MsgActCooldown[0] == 0, "HS_AppData.MsgActCooldown[0] == 0"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -802,7 +856,8 @@ void HS_MonitorApplications_Test_MsgActsErrorDefaultNoEvent(void) HS_AppData.MATablePtr = &MATable[0]; - CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, CFE_SB_ValueToMsgId(HS_CMD_MID), + CFE_MSG_Init((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, + CFE_SB_ValueToMsgId(HS_CMD_MID), sizeof(HS_NoopCmd_t)); CFE_MSG_SetFcnCode((CFE_MSG_Message_t *)&HS_AppData.MATablePtr[0].MsgBuf, HS_NOOP_CC); @@ -838,7 +893,8 @@ void HS_MonitorApplications_Test_MsgActsErrorDefaultNoEvent(void) UtAssert_True(HS_AppData.MsgActCooldown[0] == 1, "HS_AppData.MsgActCooldown[0] == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -872,10 +928,44 @@ void HS_MonitorApplications_CheckInCountdownNotZero(void) UtAssert_True(HS_AppData.AppMonEnables[0] == 1, "HS_AppData.AppMonEnables[0] == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } +void HS_MonitorEvent_Test_EventMonTblPtrNull(void) +{ + CFE_EVS_LongEventTlm_t Packet; + + /* + ** Initialize a basic packet dummy input. + ** the UUT assumes this input pointer has been checked for null + ** by the calling function, `HS_ProcessCommands` + */ + memset(&Packet, 0, sizeof(Packet)); + CFE_MSG_Init((CFE_MSG_Message_t *)&Packet, CFE_SB_ValueToMsgId(HS_CMD_MID), sizeof(CFE_EVS_LongEventTlm_t)); + + /* Initialize the EMT to null to drive our pointer check test case */ + HS_AppData.EMTablePtr = NULL; + + /* Execute the function being tested */ + HS_MonitorEvent(&Packet); + + /* + ** Verify UUT exited before processing info from the EMT + ** Since the UUT simply returns during this, the best thing we can do is + ** verify that none of the stub functions were called + */ + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(OS_TaskDelay)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_WriteToSysLog)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_ResetCFE)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_GetAppIDByName)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_RestartApp)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_ES_DeleteApp)), 0); + UtAssert_UINT32_EQ(UT_GetStubCount(UT_KEY(CFE_SB_TransmitMsg)), 0); +} + void HS_MonitorEvent_Test_AppName(void) { HS_EMTEntry_t EMTable[HS_MAX_MONITORED_APPS]; @@ -911,7 +1001,8 @@ void HS_MonitorEvent_Test_AppName(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -927,9 +1018,11 @@ void HS_MonitorEvent_Test_ProcErrorReset(void) memset(EMTable, 0, sizeof(EMTable)); memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitor: APP:(%%s) EID:(%%d): Action: Processor Reset"); - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedSysLogString, + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "HS App: Event Monitor: APP:(%%s) EID:(%%d): Action: Processor Reset\n"); HS_AppData.MATablePtr = &MATable[0]; @@ -962,7 +1055,8 @@ void HS_MonitorEvent_Test_ProcErrorReset(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); @@ -984,9 +1078,11 @@ void HS_MonitorEvent_Test_ProcErrorNoReset(void) memset(EMTable, 0, sizeof(EMTable)); memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitor: APP:(%%s) EID:(%%d): Action: Processor Reset"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Processor Reset Action Limit Reached: No Reset Performed"); HS_AppData.MATablePtr = &MATable[0]; @@ -1027,7 +1123,8 @@ void HS_MonitorEvent_Test_ProcErrorNoReset(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -1042,9 +1139,11 @@ void HS_MonitorEvent_Test_AppRestartErrors(void) memset(EMTable, 0, sizeof(EMTable)); memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitor: APP:(%%s) EID:(%%d): Action: Restart Application"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Call to Restart App Failed: APP:(%%s) ERR: 0x%%08X"); HS_AppData.MATablePtr = &MATable[0]; @@ -1086,7 +1185,8 @@ void HS_MonitorEvent_Test_AppRestartErrors(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -1101,7 +1201,8 @@ void HS_MonitorEvent_Test_OnlySecondAppRestartError(void) memset(EMTable, 0, sizeof(EMTable)); memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Call to Restart App Failed: APP:(%%s) ERR: 0x%%08X"); HS_AppData.MATablePtr = &MATable[0]; @@ -1135,7 +1236,8 @@ void HS_MonitorEvent_Test_OnlySecondAppRestartError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1150,7 +1252,8 @@ void HS_MonitorEvent_Test_NoSecondAppRestartError(void) memset(EMTable, 0, sizeof(EMTable)); memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitor: APP:(%%s) EID:(%%d): Action: Restart Application"); HS_AppData.MATablePtr = &MATable[0]; @@ -1184,7 +1287,8 @@ void HS_MonitorEvent_Test_NoSecondAppRestartError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1199,9 +1303,11 @@ void HS_MonitorEvent_Test_DeleteErrors(void) memset(EMTable, 0, sizeof(EMTable)); memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitor: APP:(%%s) EID:(%%d): Action: Delete Application"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Call to Delete App Failed: APP:(%%s) ERR: 0x%%08X"); HS_AppData.MATablePtr = &MATable[0]; @@ -1243,7 +1349,8 @@ void HS_MonitorEvent_Test_DeleteErrors(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -1258,7 +1365,8 @@ void HS_MonitorEvent_Test_OnlySecondDeleteError(void) memset(EMTable, 0, sizeof(EMTable)); memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Call to Delete App Failed: APP:(%%s) ERR: 0x%%08X"); HS_AppData.MATablePtr = &MATable[0]; @@ -1292,7 +1400,8 @@ void HS_MonitorEvent_Test_OnlySecondDeleteError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1307,7 +1416,8 @@ void HS_MonitorEvent_Test_NoSecondDeleteError(void) memset(EMTable, 0, sizeof(EMTable)); memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitor: APP:(%%s) EID:(%%d): Action: Delete Application"); HS_AppData.MATablePtr = &MATable[0]; @@ -1341,7 +1451,8 @@ void HS_MonitorEvent_Test_NoSecondDeleteError(void) UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1356,7 +1467,8 @@ void HS_MonitorEvent_Test_MsgActsError(void) memset(EMTable, 0, sizeof(EMTable)); memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Monitor: APP:(%%s) EID:(%%d): Action: Message Action Index: %%d"); HS_AppData.MATablePtr = &MATable[0]; @@ -1398,7 +1510,8 @@ void HS_MonitorEvent_Test_MsgActsError(void) UtAssert_True(HS_AppData.MsgActCooldown[0] == 5, "HS_AppData.MsgActCooldown[0] == 5"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1480,7 +1593,8 @@ void HS_MonitorEvent_Test_MsgActsDefaultDisabled(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1519,7 +1633,8 @@ void HS_MonitorEvent_Test_MsgActsDefaultGreaterLastNonMsg(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1555,7 +1670,8 @@ void HS_MonitorEvent_Test_MsgActsDefaultLessMaxActTypes(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1576,9 +1692,9 @@ void HS_MonitorEvent_Test_MsgActsDefaultMaxActTypes(void) HS_AppData.EMTablePtr = EMTable; HS_AppData.MATablePtr = MATable; - HS_AppData.EMTablePtr[0].ActionType = HS_EMTActType_LAST_NONMSG + HS_MAX_MSG_ACT_TYPES; - HS_AppData.EMTablePtr[0].EventID = Packet.Payload.PacketID.EventID; - MsgActIndex = HS_AppData.EMTablePtr[0].ActionType - HS_EMTActType_LAST_NONMSG - 1; + HS_AppData.EMTablePtr[0].ActionType = HS_EMTActType_LAST_NONMSG + HS_MAX_MSG_ACT_TYPES; + HS_AppData.EMTablePtr[0].EventID = Packet.Payload.PacketID.EventID; + MsgActIndex = HS_AppData.EMTablePtr[0].ActionType - HS_EMTActType_LAST_NONMSG - 1; HS_AppData.MATablePtr[MsgActIndex].EnableState = HS_MATState_ENABLED; strncpy(HS_AppData.EMTablePtr[0].AppName, "AppName", 10); @@ -1593,7 +1709,8 @@ void HS_MonitorEvent_Test_MsgActsDefaultMaxActTypes(void) /* Verify results */ /* 1 event message that we don't care about in this test */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1634,7 +1751,8 @@ void HS_MonitorEvent_Test_MsgActsCoolDown(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1675,7 +1793,8 @@ void HS_MonitorEvent_Test_MsgActsMATDisabled(void) /* Verify results */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1693,7 +1812,8 @@ void HS_MonitorUtilization_Test_HighCurrentUtil(void) /* For this test case, we don't care about any messages or variables changed after this is set */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1755,7 +1875,8 @@ void HS_MonitorUtilization_Test_CPUHoggingNotMax(void) UtAssert_True(HS_AppData.CurrentCPUHoggingTime == 1, "HS_AppData.CurrentCPUHoggingTime == 1"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); /* For this test case, we don't care about any variables changed after this message */ @@ -1779,7 +1900,8 @@ void HS_MonitorUtilization_Test_CurrentCPUHogStateDisabled(void) /* For this test case, we don't care about any variables changed after this variable is set */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1802,7 +1924,8 @@ void HS_MonitorUtilization_Test_HighUtilIndex(void) UtAssert_True(HS_AppData.UtilCpuPeak == HS_CPU_UTILIZATION_MAX, "HS_AppData.UtilCpuPeak == HS_CPU_UTILIZATION_MAX"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1825,7 +1948,8 @@ void HS_MonitorUtilization_Test_LowUtilIndex(void) UtAssert_True(HS_AppData.UtilCpuPeak == HS_CPU_UTILIZATION_MAX, "HS_AppData.UtilCpuPeak == HS_CPU_UTILIZATION_MAX"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -1839,7 +1963,8 @@ void HS_ValidateAMTable_Test_UnusedTableEntryCycleCountZero(void) memset(AMTable, 0, sizeof(AMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AppMon verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.AMTablePtr = AMTable; @@ -1866,7 +1991,8 @@ void HS_ValidateAMTable_Test_UnusedTableEntryCycleCountZero(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1880,7 +2006,8 @@ void HS_ValidateAMTable_Test_UnusedTableEntryActionTypeNOACT(void) memset(AMTable, 0, sizeof(AMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AppMon verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.AMTablePtr = AMTable; @@ -1907,7 +2034,8 @@ void HS_ValidateAMTable_Test_UnusedTableEntryActionTypeNOACT(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -1921,9 +2049,11 @@ void HS_ValidateAMTable_Test_BufferNotNull(void) memset(AMTable, 0, sizeof(AMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AppMon verify err: Entry = %%d, Err = %%d, Action = %%d, App = %%s"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AppMon verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.AMTablePtr = AMTable; @@ -1960,7 +2090,8 @@ void HS_ValidateAMTable_Test_BufferNotNull(void) UtAssert_True(Result == HS_AMTVal_ERR_NUL, "Result == HS_AMTVal_ERR_NUL"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -1974,9 +2105,11 @@ void HS_ValidateAMTable_Test_ActionTypeNotValid(void) memset(AMTable, 0, sizeof(AMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AppMon verify err: Entry = %%d, Err = %%d, Action = %%d, App = %%s"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AppMon verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.AMTablePtr = AMTable; @@ -2013,7 +2146,8 @@ void HS_ValidateAMTable_Test_ActionTypeNotValid(void) UtAssert_True(Result == HS_AMTVal_ERR_ACT, "Result == HS_AMTVal_ERR_ACT"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -2027,7 +2161,8 @@ void HS_ValidateAMTable_Test_EntryGood(void) memset(AMTable, 0, sizeof(AMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "AppMon verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.AMTablePtr = AMTable; @@ -2058,7 +2193,8 @@ void HS_ValidateAMTable_Test_EntryGood(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2076,7 +2212,8 @@ void HS_ValidateAMTable_Test_Null(void) UtAssert_True(Result == HS_TBL_VAL_ERR, "Result == HS_TBL_VAL_ERR"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2090,7 +2227,8 @@ void HS_ValidateEMTable_Test_UnusedTableEntryEventIDZero(void) memset(EMTable, 0, sizeof(EMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "EventMon verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.EMTablePtr = EMTable; @@ -2117,7 +2255,8 @@ void HS_ValidateEMTable_Test_UnusedTableEntryEventIDZero(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2131,7 +2270,8 @@ void HS_ValidateEMTable_Test_UnusedTableEntryActionTypeNOACT(void) memset(EMTable, 0, sizeof(EMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "EventMon verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.EMTablePtr = EMTable; @@ -2158,7 +2298,8 @@ void HS_ValidateEMTable_Test_UnusedTableEntryActionTypeNOACT(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2172,9 +2313,11 @@ void HS_ValidateEMTable_Test_BufferNotNull(void) memset(EMTable, 0, sizeof(EMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "EventMon verify err: Entry = %%d, Err = %%d, Action = %%d, ID = %%d App = %%s"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "EventMon verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.EMTablePtr = EMTable; @@ -2211,7 +2354,8 @@ void HS_ValidateEMTable_Test_BufferNotNull(void) UtAssert_True(Result == HS_EMTVal_ERR_NUL, "Result == HS_EMTVal_ERR_NUL"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -2225,9 +2369,11 @@ void HS_ValidateEMTable_Test_ActionTypeNotValid(void) memset(EMTable, 0, sizeof(EMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "EventMon verify err: Entry = %%d, Err = %%d, Action = %%d, ID = %%d App = %%s"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "EventMon verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.EMTablePtr = EMTable; @@ -2264,7 +2410,8 @@ void HS_ValidateEMTable_Test_ActionTypeNotValid(void) UtAssert_True(Result == HS_AMTVal_ERR_ACT, "Result == HS_AMTVal_ERR_ACT"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -2278,7 +2425,8 @@ void HS_ValidateEMTable_Test_EntryGood(void) memset(EMTable, 0, sizeof(EMTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "EventMon verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.EMTablePtr = EMTable; @@ -2309,7 +2457,8 @@ void HS_ValidateEMTable_Test_EntryGood(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2319,7 +2468,8 @@ void HS_ValidateEMTable_Test_Null(void) int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error in EM Table Validation. Table is null."); /* Execute the function being tested */ @@ -2337,7 +2487,8 @@ void HS_ValidateEMTable_Test_Null(void) UtAssert_True(Result == HS_TBL_VAL_ERR, "Result == HS_TBL_VAL_ERR"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2351,7 +2502,8 @@ void HS_ValidateXCTable_Test_UnusedTableEntry(void) memset(XCTable, 0, sizeof(XCTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ExeCount verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.XCTablePtr = XCTable; @@ -2377,7 +2529,8 @@ void HS_ValidateXCTable_Test_UnusedTableEntry(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2391,9 +2544,11 @@ void HS_ValidateXCTable_Test_BufferNotNull(void) memset(XCTable, 0, sizeof(XCTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ExeCount verify err: Entry = %%d, Err = %%d, Type = %%d, Name = %%s"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ExeCount verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.XCTablePtr = XCTable; @@ -2429,7 +2584,8 @@ void HS_ValidateXCTable_Test_BufferNotNull(void) UtAssert_True(Result == HS_XCTVal_ERR_NUL, "Result == HS_XCTVal_ERR_NUL"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -2443,9 +2599,11 @@ void HS_ValidateXCTable_Test_ResourceTypeNotValid(void) memset(XCTable, 0, sizeof(XCTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ExeCount verify err: Entry = %%d, Err = %%d, Type = %%d, Name = %%s"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ExeCount verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.XCTablePtr = XCTable; @@ -2487,7 +2645,8 @@ void HS_ValidateXCTable_Test_ResourceTypeNotValid(void) UtAssert_True(Result == HS_XCTVal_ERR_TYPE, "Result == HS_XCTVal_ERR_TYPE"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -2501,7 +2660,8 @@ void HS_ValidateXCTable_Test_EntryGood(void) memset(XCTable, 0, sizeof(XCTable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ExeCount verify results: good = %%d, bad = %%d, unused = %%d"); HS_AppData.XCTablePtr = XCTable; @@ -2527,7 +2687,8 @@ void HS_ValidateXCTable_Test_EntryGood(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2537,7 +2698,8 @@ void HS_ValidateXCTable_Test_Null(void) int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error in XC Table Validation. Table is null."); /* Execute the function being tested */ @@ -2555,7 +2717,8 @@ void HS_ValidateXCTable_Test_Null(void) UtAssert_True(Result == HS_TBL_VAL_ERR, "Result == HS_TBL_VAL_ERR"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2571,7 +2734,8 @@ void HS_ValidateMATable_Test_UnusedTableEntry(void) memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "MsgActs verify results: good = %%d, bad = %%d, unused = %%d"); TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); @@ -2605,7 +2769,8 @@ void HS_ValidateMATable_Test_UnusedTableEntry(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2621,9 +2786,11 @@ void HS_ValidateMATable_Test_InvalidEnableState(void) memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "MsgActs verify err: Entry = %%d, Err = %%d, Length = %%d, ID = 0x%%08lX"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "MsgActs verify results: good = %%d, bad = %%d, unused = %%d"); TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); @@ -2662,7 +2829,8 @@ void HS_ValidateMATable_Test_InvalidEnableState(void) UtAssert_True(Result == HS_MATVal_ERR_ENA, "Result == HS_MATVal_ERR_ENA"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -2678,9 +2846,11 @@ void HS_ValidateMATable_Test_MessageIDTooHigh(void) memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "MsgActs verify err: Entry = %%d, Err = %%d, Length = %%d, ID = 0x%%08lX"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "MsgActs verify results: good = %%d, bad = %%d, unused = %%d"); TestMsgId = CFE_SB_INVALID_MSG_ID; @@ -2719,7 +2889,8 @@ void HS_ValidateMATable_Test_MessageIDTooHigh(void) UtAssert_True(Result == HS_MATVal_ERR_ID, "Result == HS_MATVal_ERR_ID"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -2735,9 +2906,11 @@ void HS_ValidateMATable_Test_LengthTooHigh(void) memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "MsgActs verify err: Entry = %%d, Err = %%d, Length = %%d, ID = 0x%%08lX"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[1], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "MsgActs verify results: good = %%d, bad = %%d, unused = %%d"); TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); @@ -2776,7 +2949,8 @@ void HS_ValidateMATable_Test_LengthTooHigh(void) UtAssert_True(Result == HS_MATVal_ERR_LEN, "Result == HS_MATVal_ERR_LEN"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", + UtAssert_True(call_count_CFE_EVS_SendEvent == 2, + "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); } @@ -2792,7 +2966,8 @@ void HS_ValidateMATable_Test_EntryGood(void) memset(MATable, 0, sizeof(MATable)); - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "MsgActs verify results: good = %%d, bad = %%d, unused = %%d"); TestMsgId = CFE_SB_ValueToMsgId(HS_CMD_MID); @@ -2823,7 +2998,8 @@ void HS_ValidateMATable_Test_EntryGood(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2833,7 +3009,8 @@ void HS_ValidateMATable_Test_Null(void) int32 strCmpResult; char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, + snprintf(ExpectedEventString[0], + CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Error in MA Table Validation. Table is null."); /* Execute the function being tested */ @@ -2851,7 +3028,8 @@ void HS_ValidateMATable_Test_Null(void) UtAssert_True(Result == HS_TBL_VAL_ERR, "Result == HS_TBL_VAL_ERR"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", + UtAssert_True(call_count_CFE_EVS_SendEvent == 1, + "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); } @@ -2874,7 +3052,8 @@ void HS_SetCDSData_Test(void) "HS_AppData.CDSData.MaxResetsNot == (uint16)(~HS_AppData.CDSData.MaxResets)"); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", + UtAssert_True(call_count_CFE_EVS_SendEvent == 0, + "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); } @@ -2883,126 +3062,240 @@ void HS_SetCDSData_Test(void) */ void UtTest_Setup(void) { - UtTest_Add(HS_MonitorApplications_Test_AppNameNotFound, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_AppMonTblPtrNull, + HS_Test_Setup, + HS_Test_TearDown, + "HS_MonitorApplications_Test_AppMonTblPtrNull"); + UtTest_Add(HS_MonitorApplications_Test_AppNameNotFound, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_AppNameNotFound"); - UtTest_Add(HS_MonitorApplications_Test_AppNameNotFoundDebugEvent, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_AppNameNotFoundDebugEvent, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_AppNameNotFoundDebugEvent"); - UtTest_Add(HS_MonitorApplications_Test_GetExeCountFailure, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_GetExeCountFailure, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_GetExeCountFailure"); - UtTest_Add(HS_MonitorApplications_Test_ProcessorResetError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_ProcessorResetError, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_ProcessorResetError"); - UtTest_Add(HS_MonitorApplications_Test_ProcessorResetActionLimitError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_ProcessorResetActionLimitError, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_ProcessorResetActionLimitError"); - UtTest_Add(HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoSuccess, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoSuccess, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoSuccess"); - UtTest_Add(HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoNotSuccess, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoNotSuccess, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoNotSuccess"); - UtTest_Add(HS_MonitorApplications_Test_RestartAppRestartSuccess, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_RestartAppRestartSuccess, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_RestartAppRestartSuccess"); - UtTest_Add(HS_MonitorApplications_Test_FailError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_FailError, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_FailError"); - UtTest_Add(HS_MonitorApplications_Test_MsgActsNOACT, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_MsgActsNOACT, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_MsgActsNOACT"); - UtTest_Add(HS_MonitorApplications_Test_MsgActsNOACTDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_MsgActsNOACTDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_MsgActsNOACTDisabled"); - UtTest_Add(HS_MonitorApplications_Test_MsgActsErrorDefault, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_MsgActsErrorDefault, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_MsgActsErrorDefault"); - UtTest_Add(HS_MonitorApplications_Test_MsgActsErrorDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_MsgActsErrorDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_MsgActsErrorDisabled"); - UtTest_Add(HS_MonitorApplications_Test_MsgActsErrorDefaultCoolDown, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_MsgActsErrorDefaultCoolDown, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_MsgActsErrorDefaultCoolDown"); - UtTest_Add(HS_MonitorApplications_Test_MsgActsErrorDefaultDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_MsgActsErrorDefaultDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_MsgActsErrorDefaultDisabled"); - UtTest_Add(HS_MonitorApplications_Test_MsgActsErrorDefaultNoEvent, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_Test_MsgActsErrorDefaultNoEvent, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_Test_MsgActsErrorDefaultNoEvent"); - UtTest_Add(HS_MonitorApplications_CheckInCountdownNotZero, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorApplications_CheckInCountdownNotZero, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorApplications_CheckInCountdownNotZero"); + UtTest_Add(HS_MonitorEvent_Test_EventMonTblPtrNull, + HS_Test_Setup, + HS_Test_TearDown, + "HS_MonitorEvent_Test_EventMonTblPtrNull"); UtTest_Add(HS_MonitorEvent_Test_AppName, HS_Test_Setup, HS_Test_TearDown, "HS_MonitorEvent_Test_AppName"); - UtTest_Add(HS_MonitorEvent_Test_ProcErrorReset, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_ProcErrorReset, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_ProcErrorReset"); - UtTest_Add(HS_MonitorEvent_Test_ProcErrorNoReset, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_ProcErrorNoReset, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_ProcErrorNoReset"); - UtTest_Add(HS_MonitorEvent_Test_AppRestartErrors, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_AppRestartErrors, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_AppRestartErrors"); - UtTest_Add(HS_MonitorEvent_Test_OnlySecondAppRestartError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_OnlySecondAppRestartError, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_OnlySecondAppRestartError"); - UtTest_Add(HS_MonitorEvent_Test_NoSecondAppRestartError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_NoSecondAppRestartError, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_NoSecondAppRestartError"); UtTest_Add(HS_MonitorEvent_Test_DeleteErrors, HS_Test_Setup, HS_Test_TearDown, "HS_MonitorEvent_Test_DeleteErrors"); - UtTest_Add(HS_MonitorEvent_Test_OnlySecondDeleteError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_OnlySecondDeleteError, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_OnlySecondDeleteError"); - UtTest_Add(HS_MonitorEvent_Test_NoSecondDeleteError, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_NoSecondDeleteError, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_NoSecondDeleteError"); UtTest_Add(HS_MonitorEvent_Test_MsgActsError, HS_Test_Setup, HS_Test_TearDown, "HS_MonitorEvent_Test_MsgActsError"); - UtTest_Add(HS_MonitorEvent_Test_MsgActsErrorNoEvent, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_MsgActsErrorNoEvent, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_MsgActsErrorNoEvent"); - UtTest_Add(HS_MonitorEvent_Test_MsgActsCoolDown, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_MsgActsCoolDown, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_MsgActsCoolDown"); - UtTest_Add(HS_MonitorEvent_Test_MsgActsMATDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_MsgActsMATDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_MsgActsMATDisabled"); - UtTest_Add(HS_MonitorEvent_Test_MsgActsDefaultDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_MsgActsDefaultDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_MsgActsDefaultDisabled"); - UtTest_Add(HS_MonitorEvent_Test_MsgActsDefaultGreaterLastNonMsg, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_MsgActsDefaultGreaterLastNonMsg, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_MsgActsDefaultGreaterLastNonMsg"); - UtTest_Add(HS_MonitorEvent_Test_MsgActsDefaultLessMaxActTypes, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_MsgActsDefaultLessMaxActTypes, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_MsgActsDefaultLessMaxActTypes"); - UtTest_Add(HS_MonitorEvent_Test_MsgActsDefaultMaxActTypes, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorEvent_Test_MsgActsDefaultMaxActTypes, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorEvent_Test_MsgActsDefaultMaxActTypes"); - UtTest_Add(HS_MonitorUtilization_Test_HighCurrentUtil, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorUtilization_Test_HighCurrentUtil, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorUtilization_Test_HighCurrentUtil"); - UtTest_Add(HS_MonitorUtilization_Test_CurrentUtilLessThanZero, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorUtilization_Test_CurrentUtilLessThanZero, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorUtilization_Test_CurrentUtilLessThanZero"); - UtTest_Add(HS_MonitorUtilization_Test_CPUHogging, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorUtilization_Test_CPUHogging, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorUtilization_Test_CPUHogging"); - UtTest_Add(HS_MonitorUtilization_Test_CPUHoggingNotMax, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorUtilization_Test_CPUHoggingNotMax, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorUtilization_Test_CPUHoggingNotMax"); - UtTest_Add(HS_MonitorUtilization_Test_CurrentCPUHogStateDisabled, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorUtilization_Test_CurrentCPUHogStateDisabled, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorUtilization_Test_CurrentCPUHogStateDisabled"); - UtTest_Add(HS_MonitorUtilization_Test_HighUtilIndex, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorUtilization_Test_HighUtilIndex, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorUtilization_Test_HighUtilIndex"); - UtTest_Add(HS_MonitorUtilization_Test_LowUtilIndex, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_MonitorUtilization_Test_LowUtilIndex, + HS_Test_Setup, + HS_Test_TearDown, "HS_MonitorUtilization_Test_LowUtilIndex"); - UtTest_Add(HS_ValidateAMTable_Test_UnusedTableEntryCycleCountZero, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateAMTable_Test_UnusedTableEntryCycleCountZero, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateAMTable_Test_UnusedTableEntryCycleCountZero"); - UtTest_Add(HS_ValidateAMTable_Test_UnusedTableEntryActionTypeNOACT, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateAMTable_Test_UnusedTableEntryActionTypeNOACT, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateAMTable_Test_UnusedTableEntryActionTypeNOACT"); - UtTest_Add(HS_ValidateAMTable_Test_BufferNotNull, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateAMTable_Test_BufferNotNull, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateAMTable_Test_BufferNotNull"); - UtTest_Add(HS_ValidateAMTable_Test_ActionTypeNotValid, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateAMTable_Test_ActionTypeNotValid, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateAMTable_Test_ActionTypeNotValid"); UtTest_Add(HS_ValidateAMTable_Test_EntryGood, HS_Test_Setup, HS_Test_TearDown, "HS_ValidateAMTable_Test_EntryGood"); UtTest_Add(HS_ValidateAMTable_Test_Null, HS_Test_Setup, HS_Test_TearDown, "HS_ValidateAMTable_Test_Null"); - UtTest_Add(HS_ValidateEMTable_Test_UnusedTableEntryEventIDZero, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateEMTable_Test_UnusedTableEntryEventIDZero, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateEMTable_Test_UnusedTableEntryEventIDZero"); - UtTest_Add(HS_ValidateEMTable_Test_UnusedTableEntryActionTypeNOACT, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateEMTable_Test_UnusedTableEntryActionTypeNOACT, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateEMTable_Test_UnusedTableEntryActionTypeNOACT"); - UtTest_Add(HS_ValidateEMTable_Test_BufferNotNull, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateEMTable_Test_BufferNotNull, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateEMTable_Test_BufferNotNull"); - UtTest_Add(HS_ValidateEMTable_Test_ActionTypeNotValid, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateEMTable_Test_ActionTypeNotValid, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateEMTable_Test_ActionTypeNotValid"); UtTest_Add(HS_ValidateEMTable_Test_EntryGood, HS_Test_Setup, HS_Test_TearDown, "HS_ValidateEMTable_Test_EntryGood"); UtTest_Add(HS_ValidateEMTable_Test_Null, HS_Test_Setup, HS_Test_TearDown, "HS_ValidateEMTable_Test_Null"); - UtTest_Add(HS_ValidateXCTable_Test_UnusedTableEntry, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateXCTable_Test_UnusedTableEntry, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateXCTable_Test_UnusedTableEntry"); - UtTest_Add(HS_ValidateXCTable_Test_BufferNotNull, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateXCTable_Test_BufferNotNull, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateXCTable_Test_BufferNotNull"); - UtTest_Add(HS_ValidateXCTable_Test_ResourceTypeNotValid, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateXCTable_Test_ResourceTypeNotValid, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateXCTable_Test_ResourceTypeNotValid"); UtTest_Add(HS_ValidateXCTable_Test_EntryGood, HS_Test_Setup, HS_Test_TearDown, "HS_ValidateXCTable_Test_EntryGood"); UtTest_Add(HS_ValidateXCTable_Test_Null, HS_Test_Setup, HS_Test_TearDown, "HS_ValidateXCTable_Test_Null"); - UtTest_Add(HS_ValidateMATable_Test_UnusedTableEntry, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateMATable_Test_UnusedTableEntry, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateMATable_Test_UnusedTableEntry"); - UtTest_Add(HS_ValidateMATable_Test_InvalidEnableState, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateMATable_Test_InvalidEnableState, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateMATable_Test_InvalidEnableState"); - UtTest_Add(HS_ValidateMATable_Test_MessageIDTooHigh, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateMATable_Test_MessageIDTooHigh, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateMATable_Test_MessageIDTooHigh"); - UtTest_Add(HS_ValidateMATable_Test_LengthTooHigh, HS_Test_Setup, HS_Test_TearDown, + UtTest_Add(HS_ValidateMATable_Test_LengthTooHigh, + HS_Test_Setup, + HS_Test_TearDown, "HS_ValidateMATable_Test_LengthTooHigh"); UtTest_Add(HS_ValidateMATable_Test_EntryGood, HS_Test_Setup, HS_Test_TearDown, "HS_ValidateMATable_Test_EntryGood"); UtTest_Add(HS_ValidateMATable_Test_Null, HS_Test_Setup, HS_Test_TearDown, "HS_ValidateMATable_Test_Null"); diff --git a/unit-test/stubs/hs_app_stubs.c b/unit-test/stubs/hs_app_stubs.c index 9484a89..d5e4fa1 100644 --- a/unit-test/stubs/hs_app_stubs.c +++ b/unit-test/stubs/hs_app_stubs.c @@ -46,7 +46,6 @@ CFE_Status_t HS_AppInit(void) */ void HS_AppMain(void) { - UT_GenStub_Execute(HS_AppMain, Basic, NULL); } diff --git a/unit-test/stubs/hs_cmds_stubs.c b/unit-test/stubs/hs_cmds_stubs.c index b7bb79c..534fe3e 100644 --- a/unit-test/stubs/hs_cmds_stubs.c +++ b/unit-test/stubs/hs_cmds_stubs.c @@ -32,7 +32,6 @@ */ void HS_AcquirePointers(void) { - UT_GenStub_Execute(HS_AcquirePointers, Basic, NULL); } @@ -43,7 +42,6 @@ void HS_AcquirePointers(void) */ void HS_AppMonStatusRefresh(void) { - UT_GenStub_Execute(HS_AppMonStatusRefresh, Basic, NULL); } @@ -182,7 +180,6 @@ CFE_Status_t HS_EnableEventMonCmd(const HS_EnableEventMonCmd_t *BufPtr) */ void HS_MsgActsStatusRefresh(void) { - UT_GenStub_Execute(HS_MsgActsStatusRefresh, Basic, NULL); } @@ -225,7 +222,6 @@ CFE_Status_t HS_ResetCmd(const HS_ResetCmd_t *BufPtr) */ void HS_ResetCounters(void) { - UT_GenStub_Execute(HS_ResetCounters, Basic, NULL); } diff --git a/unit-test/stubs/hs_monitors_stubs.c b/unit-test/stubs/hs_monitors_stubs.c index d4e88f8..2709459 100644 --- a/unit-test/stubs/hs_monitors_stubs.c +++ b/unit-test/stubs/hs_monitors_stubs.c @@ -32,7 +32,6 @@ */ void HS_MonitorApplications(void) { - UT_GenStub_Execute(HS_MonitorApplications, Basic, NULL); } @@ -55,7 +54,6 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) */ void HS_MonitorUtilization(void) { - UT_GenStub_Execute(HS_MonitorUtilization, Basic, NULL); } diff --git a/unit-test/stubs/hs_sysmon_stubs.c b/unit-test/stubs/hs_sysmon_stubs.c index 12b1248..06e2a8d 100644 --- a/unit-test/stubs/hs_sysmon_stubs.c +++ b/unit-test/stubs/hs_sysmon_stubs.c @@ -32,7 +32,6 @@ */ void HS_SysMonCleanup(void) { - UT_GenStub_Execute(HS_SysMonCleanup, Basic, NULL); } diff --git a/unit-test/utilities/hs_test_utils.c b/unit-test/utilities/hs_test_utils.c index 44c7d02..568f7da 100644 --- a/unit-test/utilities/hs_test_utils.c +++ b/unit-test/utilities/hs_test_utils.c @@ -63,7 +63,8 @@ void UT_Handler_CFE_EVS_SendEvent(void *UserObj, UT_EntryKey_t FuncKey, const UT if (CallCount > (sizeof(context_CFE_EVS_SendEvent) / sizeof(context_CFE_EVS_SendEvent[0]))) { UtAssert_Failed("CFE_EVS_SendEvent UT depth %u exceeded: %u, increase UT_MAX_SENDEVENT_DEPTH", - UT_MAX_SENDEVENT_DEPTH, CallCount); + UT_MAX_SENDEVENT_DEPTH, + CallCount); } else { @@ -71,7 +72,8 @@ void UT_Handler_CFE_EVS_SendEvent(void *UserObj, UT_EntryKey_t FuncKey, const UT context_CFE_EVS_SendEvent[idx].EventID = UT_Hook_GetArgValueByName(Context, "EventID", uint16); context_CFE_EVS_SendEvent[idx].EventType = UT_Hook_GetArgValueByName(Context, "EventType", uint16); - strncpy(context_CFE_EVS_SendEvent[idx].Spec, UT_Hook_GetArgValueByName(Context, "Spec", const char *), + strncpy(context_CFE_EVS_SendEvent[idx].Spec, + UT_Hook_GetArgValueByName(Context, "Spec", const char *), CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); context_CFE_EVS_SendEvent[idx].Spec[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH - 1] = '\0'; } @@ -79,7 +81,8 @@ void UT_Handler_CFE_EVS_SendEvent(void *UserObj, UT_EntryKey_t FuncKey, const UT void UT_Handler_CFE_ES_WriteToSysLog(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context, va_list va) { - strncpy(context_CFE_ES_WriteToSysLog.Spec, UT_Hook_GetArgValueByName(Context, "SpecStringPtr", const char *), + strncpy(context_CFE_ES_WriteToSysLog.Spec, + UT_Hook_GetArgValueByName(Context, "SpecStringPtr", const char *), CFE_MISSION_EVS_MAX_MESSAGE_LENGTH - 1); context_CFE_ES_WriteToSysLog.Spec[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH - 1] = '\0'; }