From a5903c839e87daadd7fb5259723980dbf1590e87 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Wed, 22 Mar 2023 17:54:29 -0400 Subject: [PATCH] Fix #96, use separate dispatcher for messages Isolate the message verification and dispatch from the general message processing. Functions in the "cmds" file now strictly handle the command content, and do not get involved in general validation. --- CMakeLists.txt | 1 + fsw/inc/ds_events.h | 2 +- fsw/inc/ds_msg.h | 12 +- fsw/inc/ds_msgdefs.h | 4 +- fsw/src/ds_app.c | 225 +- fsw/src/ds_app.h | 33 +- fsw/src/ds_cmds.c | 578 ++--- fsw/src/ds_cmds.h | 40 +- fsw/src/ds_dispatch.c | 571 +++++ fsw/src/ds_dispatch.h | 61 + unit-test/CMakeLists.txt | 1 + unit-test/ds_app_tests.c | 566 +---- unit-test/ds_cmds_tests.c | 3123 +++++---------------------- unit-test/ds_dispatch_tests.c | 581 +++++ unit-test/stubs/ds_app_stubs.c | 30 +- unit-test/stubs/ds_cmds_stubs.c | 152 +- unit-test/stubs/ds_dispatch_stubs.c | 51 + unit-test/utilities/ds_test_utils.h | 40 +- 18 files changed, 2088 insertions(+), 3983 deletions(-) create mode 100644 fsw/src/ds_dispatch.c create mode 100644 fsw/src/ds_dispatch.h create mode 100644 unit-test/ds_dispatch_tests.c create mode 100644 unit-test/stubs/ds_dispatch_stubs.c diff --git a/CMakeLists.txt b/CMakeLists.txt index f07d904..b4ba265 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ set(APP_SRC_FILES fsw/src/ds_cmds.c fsw/src/ds_app.c fsw/src/ds_file.c + fsw/src/ds_dispatch.c ) # Create the app module diff --git a/fsw/inc/ds_events.h b/fsw/inc/ds_events.h index a0fc2d0..3de5f4a 100644 --- a/fsw/inc/ds_events.h +++ b/fsw/inc/ds_events.h @@ -846,7 +846,7 @@ * \par Cause: * * This event is issued when the filter table name is not successfully - * created (via snprintf) in the DS_AppProcessHK function. + * created (via snprintf) in the DS_AppSendHkCmd function. */ #define DS_APPHK_FILTER_TBL_PRINT_ERR_EID 70 diff --git a/fsw/inc/ds_msg.h b/fsw/inc/ds_msg.h index f4b50a2..4f31b74 100644 --- a/fsw/inc/ds_msg.h +++ b/fsw/inc/ds_msg.h @@ -32,6 +32,14 @@ * \{ */ +/** + * \brief Send HK Request + */ +typedef struct +{ + CFE_MSG_CommandHeader_t CommandHeader; /**< \brief cFE Software Bus command message header */ +} DS_SendHkCmd_t; + /** * \brief No-Operation Command * @@ -45,12 +53,12 @@ typedef struct /** * \brief Reset Housekeeping Telemetry Command * - * For command details see #DS_RESET_CC + * For command details see #DS_RESET_COUNTERS_CC */ typedef struct { CFE_MSG_CommandHeader_t CommandHeader; /**< \brief cFE Software Bus command message header */ -} DS_ResetCmd_t; +} DS_ResetCountersCmd_t; /** * \brief Payload containing Ena/Dis State diff --git a/fsw/inc/ds_msgdefs.h b/fsw/inc/ds_msgdefs.h index a959938..0523a3e 100644 --- a/fsw/inc/ds_msgdefs.h +++ b/fsw/inc/ds_msgdefs.h @@ -65,7 +65,7 @@ * This command will set the housekeeping counters to zero * * \par Command Structure - * #DS_ResetCmd_t + * #DS_ResetCountersCmd_t * * \par Command Verification * Evidence of success may be found in the following telemetry: @@ -83,7 +83,7 @@ * \par Criticality * None */ -#define DS_RESET_CC 1 +#define DS_RESET_COUNTERS_CC 1 /** * \brief Set Enable/Disable State For DS Application diff --git a/fsw/src/ds_app.c b/fsw/src/ds_app.c index 74c99d4..21f8b73 100644 --- a/fsw/src/ds_app.c +++ b/fsw/src/ds_app.c @@ -35,6 +35,7 @@ #include "ds_msg.h" #include "ds_app.h" +#include "ds_dispatch.h" #include "ds_cmds.h" #include "ds_file.h" #include "ds_table.h" @@ -273,231 +274,13 @@ int32 DS_AppInitialize(void) return Result; } -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* */ -/* Process Software Bus messages */ -/* */ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -void DS_AppProcessMsg(const CFE_SB_Buffer_t *BufPtr) -{ - CFE_SB_MsgId_t MessageID = CFE_SB_INVALID_MSG_ID; - size_t ActualLength = 0; - size_t ExpectedLength = 0; - - CFE_MSG_GetMsgId(&BufPtr->Msg, &MessageID); - - switch (CFE_SB_MsgIdToValue(MessageID)) - { - /* - ** DS application commands... - */ - case DS_CMD_MID: - DS_AppProcessCmd(BufPtr); - if (DS_TableFindMsgID(MessageID) != DS_INDEX_NONE) - { - DS_AppStorePacket(MessageID, BufPtr); - } - break; - - /* - ** DS housekeeping request command... - */ - case DS_SEND_HK_MID: - - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - ExpectedLength = sizeof(DS_NoopCmd_t); - if (ExpectedLength != ActualLength) - { - CFE_EVS_SendEvent(DS_HK_REQUEST_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid HK request length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else - { - DS_AppProcessHK(); - if (DS_TableFindMsgID(MessageID) != DS_INDEX_NONE) - { - DS_AppStorePacket(MessageID, BufPtr); - } - } - break; - - /* - ** Unknown message ID's (must be something to store)... - */ - default: - DS_AppStorePacket(MessageID, BufPtr); - break; - } -} - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/* */ -/* Process application commands */ -/* */ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ - -void DS_AppProcessCmd(const CFE_SB_Buffer_t *BufPtr) -{ - CFE_MSG_FcnCode_t CommandCode = 0; - - CFE_MSG_GetFcnCode(&BufPtr->Msg, &CommandCode); - - switch (CommandCode) - { - /* - ** Do nothing command (aliveness test)... - */ - case DS_NOOP_CC: - DS_CmdNoop(BufPtr); - break; - - /* - ** Set housekeeping telemetry counters to zero... - */ - case DS_RESET_CC: - DS_CmdReset(BufPtr); - break; - - /* - ** Set DS application enable/disable state... - */ - case DS_SET_APP_STATE_CC: - DS_CmdSetAppState(BufPtr); - break; - - /* - ** Set packet filter file index... - */ - case DS_SET_FILTER_FILE_CC: - DS_CmdSetFilterFile(BufPtr); - break; - - /* - ** Set packet filter type (time vs count)... - */ - case DS_SET_FILTER_TYPE_CC: - DS_CmdSetFilterType(BufPtr); - break; - - /* - ** Set packet filter algorithm parameters... - */ - case DS_SET_FILTER_PARMS_CC: - DS_CmdSetFilterParms(BufPtr); - break; - - /* - ** Set destination file filename type (time vs count)... - */ - case DS_SET_DEST_TYPE_CC: - DS_CmdSetDestType(BufPtr); - break; - - /* - ** Set destination file enable/disable state... - */ - case DS_SET_DEST_STATE_CC: - DS_CmdSetDestState(BufPtr); - break; - - /* - ** Set destination file path portion of filename... - */ - case DS_SET_DEST_PATH_CC: - DS_CmdSetDestPath(BufPtr); - break; - - /* - ** Set destination file base portion of filename... - */ - case DS_SET_DEST_BASE_CC: - DS_CmdSetDestBase(BufPtr); - break; - - /* - ** Set destination file extension portion of filename... - */ - case DS_SET_DEST_EXT_CC: - DS_CmdSetDestExt(BufPtr); - break; - - /* - ** Set destination file maximum size limit... - */ - case DS_SET_DEST_SIZE_CC: - DS_CmdSetDestSize(BufPtr); - break; - - /* - ** Set destination file maximum age limit... - */ - case DS_SET_DEST_AGE_CC: - DS_CmdSetDestAge(BufPtr); - break; - - /* - ** Set destination file sequence count portion of filename... - */ - case DS_SET_DEST_COUNT_CC: - DS_CmdSetDestCount(BufPtr); - break; - - /* - ** Close destination file (next packet will re-open)... - */ - case DS_CLOSE_FILE_CC: - DS_CmdCloseFile(BufPtr); - break; - - /* - ** Get file info telemetry packet... - */ - case DS_GET_FILE_INFO_CC: - DS_CmdGetFileInfo(BufPtr); - break; - - /* - ** Add message ID to filter table... - */ - case DS_ADD_MID_CC: - DS_CmdAddMID(BufPtr); - break; - - /* - ** Remove message ID from filter table... - */ - case DS_REMOVE_MID_CC: - DS_CmdRemoveMID(BufPtr); - break; - - /* - ** Close all destination files (next packet will re-open)... - */ - case DS_CLOSE_ALL_CC: - DS_CmdCloseAll(BufPtr); - break; - - /* - ** DS application command with unknown command code... - */ - default: - CFE_EVS_SendEvent(DS_CMD_CODE_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid command code: MID = 0x%08X, CC = %d", DS_CMD_MID, CommandCode); - - DS_AppData.CmdRejectedCounter++; - break; - } -} - /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* Process hk request command */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_AppProcessHK(void) +void DS_AppSendHkCmd(void) { DS_HkPacket_t HkPacket; int32 i = 0; @@ -588,7 +371,7 @@ void DS_AppProcessHK(void) /* If the filter table name is invalid, send an event and erase any * stale/misleading filename from the HK packet */ CFE_EVS_SendEvent(DS_APPHK_FILTER_TBL_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid filter tbl name in DS_AppProcessHK. Name=%s, Err=0x%08X", FilterTblName, Status); + "Invalid filter tbl name in DS_AppSendHkCmd. Name=%s, Err=0x%08X", FilterTblName, Status); memset(PayloadPtr->FilterTblFilename, 0, sizeof(PayloadPtr->FilterTblFilename)); } @@ -598,7 +381,7 @@ void DS_AppProcessHK(void) /* If the filter table name couldn't be copied, send an event and erase * any stale/misleading filename from the HK packet */ CFE_EVS_SendEvent(DS_APPHK_FILTER_TBL_PRINT_ERR_EID, CFE_EVS_EventType_ERROR, - "Filter tbl name copy fail in DS_AppProcessHK. Err=%d", (int)Status); + "Filter tbl name copy fail in DS_AppSendHkCmd. Err=%d", (int)Status); memset(PayloadPtr->FilterTblFilename, 0, sizeof(PayloadPtr->FilterTblFilename)); } diff --git a/fsw/src/ds_app.h b/fsw/src/ds_app.h index db7a7e6..36c23db 100644 --- a/fsw/src/ds_app.h +++ b/fsw/src/ds_app.h @@ -147,37 +147,6 @@ void DS_AppMain(void); */ int32 DS_AppInitialize(void); -/** - * \brief Software Bus message handler - * - * \par Description - * Process packets received via Software Bus message pipe - * - may call application housekeeping request command handler - * - may call 1Hz wakeup command handler (if enabled) - * - may call application ground command handler - * All packets are processed for possible data storage - * - * \par Assumptions, External Events, and Notes: - * (none) - * - * \param[in] BufPtr Software Bus message pointer - */ -void DS_AppProcessMsg(const CFE_SB_Buffer_t *BufPtr); - -/** - * \brief Application ground command handler - * - * \par Description - * Call command code specific DS command handler function - * Generate command error event for unknown command codes - * - * \par Assumptions, External Events, and Notes: - * (none) - * - * \param[in] BufPtr Software Bus message pointer - */ -void DS_AppProcessCmd(const CFE_SB_Buffer_t *BufPtr); - /** * \brief Application housekeeping request command handler * @@ -190,7 +159,7 @@ void DS_AppProcessCmd(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_HkPacket_t */ -void DS_AppProcessHK(void); +void DS_AppSendHkCmd(void); /** * \brief Application packet storage pre-processor diff --git a/fsw/src/ds_cmds.c b/fsw/src/ds_cmds.c index b9ae139..16ba4ae 100644 --- a/fsw/src/ds_cmds.c +++ b/fsw/src/ds_cmds.c @@ -54,34 +54,15 @@ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdNoop(const CFE_SB_Buffer_t *BufPtr) +void DS_NoopCmd(const CFE_SB_Buffer_t *BufPtr) { - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_NoopCmd_t); + /* + ** Do nothing except display "aliveness" event... + */ + DS_AppData.CmdAcceptedCounter++; - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - - CFE_EVS_SendEvent(DS_NOOP_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid NOOP command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else - { - /* - ** Do nothing except display "aliveness" event... - */ - DS_AppData.CmdAcceptedCounter++; - - CFE_EVS_SendEvent(DS_NOOP_CMD_EID, CFE_EVS_EventType_INFORMATION, "NOOP command, Version %d.%d.%d.%d", - DS_MAJOR_VERSION, DS_MINOR_VERSION, DS_REVISION, DS_MISSION_REV); - } + CFE_EVS_SendEvent(DS_NOOP_CMD_EID, CFE_EVS_EventType_INFORMATION, "NOOP command, Version %d.%d.%d.%d", + DS_MAJOR_VERSION, DS_MINOR_VERSION, DS_REVISION, DS_MISSION_REV); } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -90,58 +71,39 @@ void DS_CmdNoop(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdReset(const CFE_SB_Buffer_t *BufPtr) +void DS_ResetCountersCmd(const CFE_SB_Buffer_t *BufPtr) { - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_ResetCmd_t); - - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - - CFE_EVS_SendEvent(DS_RESET_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid RESET command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else - { - /* - ** Reset application command counters... - */ - DS_AppData.CmdAcceptedCounter = 0; - DS_AppData.CmdRejectedCounter = 0; - - /* - ** Reset packet storage counters... - */ - DS_AppData.DisabledPktCounter = 0; - DS_AppData.IgnoredPktCounter = 0; - DS_AppData.FilteredPktCounter = 0; - DS_AppData.PassedPktCounter = 0; - - /* - ** Reset file I/O counters... - */ - DS_AppData.FileWriteCounter = 0; - DS_AppData.FileWriteErrCounter = 0; - DS_AppData.FileUpdateCounter = 0; - DS_AppData.FileUpdateErrCounter = 0; - - /* - ** Reset configuration table counters... - */ - DS_AppData.DestTblLoadCounter = 0; - DS_AppData.DestTblErrCounter = 0; - DS_AppData.FilterTblLoadCounter = 0; - DS_AppData.FilterTblErrCounter = 0; - - CFE_EVS_SendEvent(DS_RESET_CMD_EID, CFE_EVS_EventType_DEBUG, "Reset counters command"); - } + /* + ** Reset application command counters... + */ + DS_AppData.CmdAcceptedCounter = 0; + DS_AppData.CmdRejectedCounter = 0; + + /* + ** Reset packet storage counters... + */ + DS_AppData.DisabledPktCounter = 0; + DS_AppData.IgnoredPktCounter = 0; + DS_AppData.FilteredPktCounter = 0; + DS_AppData.PassedPktCounter = 0; + + /* + ** Reset file I/O counters... + */ + DS_AppData.FileWriteCounter = 0; + DS_AppData.FileWriteErrCounter = 0; + DS_AppData.FileUpdateCounter = 0; + DS_AppData.FileUpdateErrCounter = 0; + + /* + ** Reset configuration table counters... + */ + DS_AppData.DestTblLoadCounter = 0; + DS_AppData.DestTblErrCounter = 0; + DS_AppData.FilterTblLoadCounter = 0; + DS_AppData.FilterTblErrCounter = 0; + + CFE_EVS_SendEvent(DS_RESET_CMD_EID, CFE_EVS_EventType_DEBUG, "Reset counters command"); } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -150,29 +112,13 @@ void DS_CmdReset(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetAppState(const CFE_SB_Buffer_t *BufPtr) +void DS_SetAppStateCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_AppState_Payload_t *DS_AppStateCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_AppStateCmd_t); - DS_AppStateCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_AppStateCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - - CFE_EVS_SendEvent(DS_ENADIS_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid APP STATE command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (DS_TableVerifyState(DS_AppStateCmd->EnableState) == false) + if (DS_TableVerifyState(DS_AppStateCmd->EnableState) == false) { /* ** Invalid enable/disable state... @@ -207,31 +153,17 @@ void DS_CmdSetAppState(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetFilterFile(const CFE_SB_Buffer_t *BufPtr) +void DS_SetFilterFileCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_FilterFile_Payload_t *DS_FilterFileCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_FilterFileCmd_t); DS_PacketEntry_t *pPacketEntry = NULL; DS_FilterParms_t *pFilterParms = NULL; int32 FilterTableIndex = 0; DS_FilterFileCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_FilterFileCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - CFE_EVS_SendEvent(DS_FILE_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid FILTER FILE command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (!CFE_SB_IsValidMsgId(DS_FilterFileCmd->MessageID)) + if (!CFE_SB_IsValidMsgId(DS_FilterFileCmd->MessageID)) { /* ** Invalid packet messageID... @@ -322,32 +254,17 @@ void DS_CmdSetFilterFile(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetFilterType(const CFE_SB_Buffer_t *BufPtr) +void DS_SetFilterTypeCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_FilterType_Payload_t *DS_FilterTypeCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_FilterTypeCmd_t); DS_PacketEntry_t *pPacketEntry = NULL; DS_FilterParms_t *pFilterParms = NULL; int32 FilterTableIndex = 0; DS_FilterTypeCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_FilterTypeCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - - CFE_EVS_SendEvent(DS_FTYPE_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid FILTER TYPE command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (!CFE_SB_IsValidMsgId(DS_FilterTypeCmd->MessageID)) + if (!CFE_SB_IsValidMsgId(DS_FilterTypeCmd->MessageID)) { /* ** Invalid packet messageID... @@ -438,31 +355,17 @@ void DS_CmdSetFilterType(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetFilterParms(const CFE_SB_Buffer_t *BufPtr) +void DS_SetFilterParmsCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_FilterParms_Payload_t *DS_FilterParmsCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_FilterParmsCmd_t); DS_PacketEntry_t *pPacketEntry = NULL; DS_FilterParms_t *pFilterParms = NULL; int32 FilterTableIndex = 0; DS_FilterParmsCmd = &((const DS_FilterParmsCmd_t *)BufPtr)->Payload; - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - - CFE_EVS_SendEvent(DS_PARMS_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid FILTER PARMS command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (!CFE_SB_IsValidMsgId(DS_FilterParmsCmd->MessageID)) + if (!CFE_SB_IsValidMsgId(DS_FilterParmsCmd->MessageID)) { /* ** Invalid packet messageID... @@ -558,29 +461,15 @@ void DS_CmdSetFilterParms(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetDestType(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestTypeCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_DestType_Payload_t *DS_DestTypeCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_DestTypeCmd_t); - DS_DestFileEntry_t *pDest = NULL; + DS_DestFileEntry_t *pDest = NULL; DS_DestTypeCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_DestTypeCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - - CFE_EVS_SendEvent(DS_NTYPE_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid DEST TYPE command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (DS_TableVerifyFileIndex(DS_DestTypeCmd->FileTableIndex) == false) + if (DS_TableVerifyFileIndex(DS_DestTypeCmd->FileTableIndex) == false) { /* ** Invalid destination file table index... @@ -637,28 +526,13 @@ void DS_CmdSetDestType(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetDestState(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestStateCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_DestState_Payload_t *DS_DestStateCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_DestStateCmd_t); - DS_DestStateCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_DestStateCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - CFE_EVS_SendEvent(DS_STATE_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid DEST STATE command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (DS_TableVerifyFileIndex(DS_DestStateCmd->FileTableIndex) == false) + if (DS_TableVerifyFileIndex(DS_DestStateCmd->FileTableIndex) == false) { /* ** Invalid destination file table index... @@ -715,29 +589,15 @@ void DS_CmdSetDestState(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetDestPath(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestPathCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_DestPath_Payload_t *DS_DestPathCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_DestPathCmd_t); - DS_DestFileEntry_t *pDest = NULL; + DS_DestFileEntry_t *pDest = NULL; DS_DestPathCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_DestPathCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - CFE_EVS_SendEvent(DS_PATH_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid DEST PATH command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (DS_TableVerifyFileIndex(DS_DestPathCmd->FileTableIndex) == false) + if (DS_TableVerifyFileIndex(DS_DestPathCmd->FileTableIndex) == false) { /* ** Invalid destination file table index... @@ -785,28 +645,14 @@ void DS_CmdSetDestPath(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetDestBase(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestBaseCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_DestBase_Payload_t *DS_DestBaseCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_DestBaseCmd_t); - DS_DestFileEntry_t * pDest = NULL; + DS_DestFileEntry_t * pDest = NULL; DS_DestBaseCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_DestBaseCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - CFE_EVS_SendEvent(DS_BASE_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid DEST BASE command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (DS_TableVerifyFileIndex(DS_DestBaseCmd->FileTableIndex) == false) + if (DS_TableVerifyFileIndex(DS_DestBaseCmd->FileTableIndex) == false) { /* ** Invalid destination file table index... @@ -854,28 +700,14 @@ void DS_CmdSetDestBase(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetDestExt(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestExtCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_DestExt_Payload_t *DS_DestExtCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_DestExtCmd_t); - DS_DestFileEntry_t * pDest = NULL; + DS_DestFileEntry_t * pDest = NULL; DS_DestExtCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_DestExtCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - - CFE_EVS_SendEvent(DS_EXT_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid DEST EXT command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (DS_TableVerifyFileIndex(DS_DestExtCmd->FileTableIndex) == false) + if (DS_TableVerifyFileIndex(DS_DestExtCmd->FileTableIndex) == false) { /* ** Invalid destination file table index... @@ -923,29 +755,14 @@ void DS_CmdSetDestExt(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetDestSize(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestSizeCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_DestSize_Payload_t *DS_DestSizeCmd; - - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_DestSizeCmd_t); - DS_DestFileEntry_t *pDest = NULL; + DS_DestFileEntry_t * pDest = NULL; DS_DestSizeCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_DestSizeCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - - CFE_EVS_SendEvent(DS_SIZE_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid DEST SIZE command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (DS_TableVerifyFileIndex(DS_DestSizeCmd->FileTableIndex) == false) + if (DS_TableVerifyFileIndex(DS_DestSizeCmd->FileTableIndex) == false) { /* ** Invalid destination file table index... @@ -1002,29 +819,14 @@ void DS_CmdSetDestSize(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetDestAge(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestAgeCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_DestAge_Payload_t *DS_DestAgeCmd; - - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_DestAgeCmd_t); - DS_DestFileEntry_t *pDest = NULL; + DS_DestFileEntry_t * pDest = NULL; DS_DestAgeCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_DestAgeCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - CFE_EVS_SendEvent(DS_AGE_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid DEST AGE command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (DS_TableVerifyFileIndex(DS_DestAgeCmd->FileTableIndex) == false) + if (DS_TableVerifyFileIndex(DS_DestAgeCmd->FileTableIndex) == false) { /* ** Invalid destination file table index... @@ -1081,29 +883,15 @@ void DS_CmdSetDestAge(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdSetDestCount(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestCountCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_DestCount_Payload_t *DS_DestCountCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_DestCountCmd_t); - DS_AppFileStatus_t * FileStatus = NULL; - DS_DestFileEntry_t * DestFile = NULL; + DS_AppFileStatus_t * FileStatus = NULL; + DS_DestFileEntry_t * DestFile = NULL; DS_DestCountCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_DestCountCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - - CFE_EVS_SendEvent(DS_SEQ_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid DEST COUNT command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (DS_TableVerifyFileIndex(DS_DestCountCmd->FileTableIndex) == false) + if (DS_TableVerifyFileIndex(DS_DestCountCmd->FileTableIndex) == false) { /* ** Invalid destination file table index... @@ -1172,27 +960,13 @@ void DS_CmdSetDestCount(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdCloseFile(const CFE_SB_Buffer_t *BufPtr) +void DS_CloseFileCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_CloseFile_Payload_t *DS_CloseFileCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_CloseFileCmd_t); DS_CloseFileCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_CloseFileCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - CFE_EVS_SendEvent(DS_CLOSE_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid DEST CLOSE command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (DS_TableVerifyFileIndex(DS_CloseFileCmd->FileTableIndex) == false) + if (DS_TableVerifyFileIndex(DS_CloseFileCmd->FileTableIndex) == false) { /* ** Invalid destination file table index... @@ -1227,43 +1001,25 @@ void DS_CmdCloseFile(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdCloseAll(const CFE_SB_Buffer_t *BufPtr) +void DS_CloseAllCmd(const CFE_SB_Buffer_t *BufPtr) { - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_CloseAllCmd_t); - int32 i = 0; - - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); + int32 i = 0; - if (ExpectedLength != ActualLength) + /* + ** Close all open destination files... + */ + for (i = 0; i < DS_DEST_FILE_CNT; i++) { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - - CFE_EVS_SendEvent(DS_CLOSE_ALL_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid DEST CLOSE ALL command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else - { - /* - ** Close all open destination files... - */ - for (i = 0; i < DS_DEST_FILE_CNT; i++) + if (OS_ObjectIdDefined(DS_AppData.FileStatus[i].FileHandle)) { - if (OS_ObjectIdDefined(DS_AppData.FileStatus[i].FileHandle)) - { - DS_FileUpdateHeader(i); - DS_FileCloseDest(i); - } + DS_FileUpdateHeader(i); + DS_FileCloseDest(i); } + } - DS_AppData.CmdAcceptedCounter++; + DS_AppData.CmdAcceptedCounter++; - CFE_EVS_SendEvent(DS_CLOSE_ALL_CMD_EID, CFE_EVS_EventType_DEBUG, "DEST CLOSE ALL command"); - } + CFE_EVS_SendEvent(DS_CLOSE_ALL_CMD_EID, CFE_EVS_EventType_DEBUG, "DEST CLOSE ALL command"); } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -1272,101 +1028,83 @@ void DS_CmdCloseAll(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdGetFileInfo(const CFE_SB_Buffer_t *BufPtr) +void DS_GetFileInfoCmd(const CFE_SB_Buffer_t *BufPtr) { DS_FileInfoPkt_t DS_FileInfoPkt; DS_FileInfo_t * FileInfoPtr; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_GetFileInfoCmd_t); - int32 i = 0; + int32 i = 0; - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); + /* + ** Create and send a file info packet... + */ + DS_AppData.CmdAcceptedCounter++; - if (ExpectedLength != ActualLength) + CFE_EVS_SendEvent(DS_GET_FILE_INFO_CMD_EID, CFE_EVS_EventType_DEBUG, "GET FILE INFO command"); + + /* + ** Initialize file info telemetry packet... + */ + CFE_MSG_Init(CFE_MSG_PTR(DS_FileInfoPkt.TelemetryHeader), CFE_SB_ValueToMsgId(DS_DIAG_TLM_MID), + sizeof(DS_FileInfoPkt_t)); + + /* + ** Process array of destination file info data... + */ + for (i = 0; i < DS_DEST_FILE_CNT; i++) { + FileInfoPtr = &DS_FileInfoPkt.Payload[i]; + /* - ** Invalid command packet length... + ** Set file age and size... */ - DS_AppData.CmdRejectedCounter++; + FileInfoPtr->FileAge = DS_AppData.FileStatus[i].FileAge; + FileInfoPtr->FileSize = DS_AppData.FileStatus[i].FileSize; - CFE_EVS_SendEvent(DS_GET_FILE_INFO_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid GET FILE INFO command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else - { /* - ** Create and send a file info packet... + ** Set file growth rate (computed when process last HK request)... */ - DS_AppData.CmdAcceptedCounter++; - - CFE_EVS_SendEvent(DS_GET_FILE_INFO_CMD_EID, CFE_EVS_EventType_DEBUG, "GET FILE INFO command"); + FileInfoPtr->FileRate = DS_AppData.FileStatus[i].FileRate; /* - ** Initialize file info telemetry packet... + ** Set current filename sequence count... */ - CFE_MSG_Init(CFE_MSG_PTR(DS_FileInfoPkt.TelemetryHeader), CFE_SB_ValueToMsgId(DS_DIAG_TLM_MID), - sizeof(DS_FileInfoPkt_t)); + FileInfoPtr->SequenceCount = DS_AppData.FileStatus[i].FileCount; /* - ** Process array of destination file info data... + ** Set file enable/disable state... */ - for (i = 0; i < DS_DEST_FILE_CNT; i++) + if (DS_AppData.DestFileTblPtr == (DS_DestFileTable_t *)NULL) { - FileInfoPtr = &DS_FileInfoPkt.Payload[i]; - - /* - ** Set file age and size... - */ - FileInfoPtr->FileAge = DS_AppData.FileStatus[i].FileAge; - FileInfoPtr->FileSize = DS_AppData.FileStatus[i].FileSize; - - /* - ** Set file growth rate (computed when process last HK request)... - */ - FileInfoPtr->FileRate = DS_AppData.FileStatus[i].FileRate; - - /* - ** Set current filename sequence count... - */ - FileInfoPtr->SequenceCount = DS_AppData.FileStatus[i].FileCount; + FileInfoPtr->EnableState = DS_DISABLED; + } + else + { + FileInfoPtr->EnableState = DS_AppData.FileStatus[i].FileState; + } - /* - ** Set file enable/disable state... - */ - if (DS_AppData.DestFileTblPtr == (DS_DestFileTable_t *)NULL) - { - FileInfoPtr->EnableState = DS_DISABLED; - } - else - { - FileInfoPtr->EnableState = DS_AppData.FileStatus[i].FileState; - } + /* + ** Set file open/closed state... + */ + if (!OS_ObjectIdDefined(DS_AppData.FileStatus[i].FileHandle)) + { + FileInfoPtr->OpenState = DS_CLOSED; + } + else + { + FileInfoPtr->OpenState = DS_OPEN; /* - ** Set file open/closed state... + ** Set current open filename... */ - if (!OS_ObjectIdDefined(DS_AppData.FileStatus[i].FileHandle)) - { - FileInfoPtr->OpenState = DS_CLOSED; - } - else - { - FileInfoPtr->OpenState = DS_OPEN; - - /* - ** Set current open filename... - */ - strncpy(FileInfoPtr->FileName, DS_AppData.FileStatus[i].FileName, sizeof(FileInfoPtr->FileName)); - } + strncpy(FileInfoPtr->FileName, DS_AppData.FileStatus[i].FileName, sizeof(FileInfoPtr->FileName)); } - - /* - ** Timestamp and send file info telemetry packet... - */ - CFE_SB_TimeStampMsg(CFE_MSG_PTR(DS_FileInfoPkt.TelemetryHeader)); - CFE_SB_TransmitMsg(CFE_MSG_PTR(DS_FileInfoPkt.TelemetryHeader), true); } + + /* + ** Timestamp and send file info telemetry packet... + */ + CFE_SB_TimeStampMsg(CFE_MSG_PTR(DS_FileInfoPkt.TelemetryHeader)); + CFE_SB_TransmitMsg(CFE_MSG_PTR(DS_FileInfoPkt.TelemetryHeader), true); } /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -1375,11 +1113,9 @@ void DS_CmdGetFileInfo(const CFE_SB_Buffer_t *BufPtr) /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdAddMID(const CFE_SB_Buffer_t *BufPtr) +void DS_AddMIDCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_AddRemoveMid_Payload_t *DS_AddMidCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_AddMidCmd_t); DS_PacketEntry_t * pPacketEntry = NULL; DS_FilterParms_t * pFilterParms = NULL; int32 FilterTableIndex = 0; @@ -1387,20 +1123,8 @@ void DS_CmdAddMID(const CFE_SB_Buffer_t *BufPtr) int32 i = 0; DS_AddMidCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_AddMidCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); - - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - CFE_EVS_SendEvent(DS_ADD_MID_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid ADD MID command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (!CFE_SB_IsValidMsgId(DS_AddMidCmd->MessageID)) + if (!CFE_SB_IsValidMsgId(DS_AddMidCmd->MessageID)) { /* ** Invalid packet message ID - can be anything but unused... @@ -1483,38 +1207,24 @@ void DS_CmdAddMID(const CFE_SB_Buffer_t *BufPtr) /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ -/* DS_CmdRemoveMID() - remove message ID from packet filter table */ +/* DS_RemoveMIDCmd() - remove message ID from packet filter table */ /* */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -void DS_CmdRemoveMID(const CFE_SB_Buffer_t *BufPtr) +void DS_RemoveMIDCmd(const CFE_SB_Buffer_t *BufPtr) { const DS_AddRemoveMid_Payload_t *DS_RemoveMidCmd; - size_t ActualLength = 0; - size_t ExpectedLength = sizeof(DS_RemoveMidCmd_t); DS_PacketEntry_t *pPacketEntry = NULL; DS_FilterParms_t *pFilterParms = NULL; int32 FilterTableIndex = 0; int32 HashTableIndex = 0; int32 i = 0; - DS_RemoveMidCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_RemoveMidCmd_t); - CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); + DS_RemoveMidCmd = DS_GET_CMD_PAYLOAD(BufPtr, DS_RemoveMidCmd_t); FilterTableIndex = DS_TableFindMsgID(DS_RemoveMidCmd->MessageID); - if (ExpectedLength != ActualLength) - { - /* - ** Invalid command packet length... - */ - DS_AppData.CmdRejectedCounter++; - - CFE_EVS_SendEvent(DS_REMOVE_MID_CMD_ERR_EID, CFE_EVS_EventType_ERROR, - "Invalid REMOVE MID command length: expected = %d, actual = %d", (int)ExpectedLength, - (int)ActualLength); - } - else if (!CFE_SB_IsValidMsgId(DS_RemoveMidCmd->MessageID)) + if (!CFE_SB_IsValidMsgId(DS_RemoveMidCmd->MessageID)) { /* ** Invalid packet message ID - can be anything but unused... diff --git a/fsw/src/ds_cmds.h b/fsw/src/ds_cmds.h index 08d45ef..5642fd3 100644 --- a/fsw/src/ds_cmds.h +++ b/fsw/src/ds_cmds.h @@ -49,7 +49,7 @@ * * \sa #DS_NOOP_CC, #DS_NoopCmd_t */ -void DS_CmdNoop(const CFE_SB_Buffer_t *BufPtr); +void DS_NoopCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief RESET command handler @@ -67,9 +67,9 @@ void DS_CmdNoop(const CFE_SB_Buffer_t *BufPtr); * * \param[in] BufPtr Software Bus message pointer * - * \sa #DS_RESET_CC, #DS_ResetCmd_t + * \sa #DS_RESET_COUNTERS_CC, #DS_ResetCountersCmd_t */ -void DS_CmdReset(const CFE_SB_Buffer_t *BufPtr); +void DS_ResetCountersCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Set application enable/disable state command handler @@ -90,7 +90,7 @@ void DS_CmdReset(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_APP_STATE_CC, #DS_AppStateCmd_t */ -void DS_CmdSetAppState(const CFE_SB_Buffer_t *BufPtr); +void DS_SetAppStateCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Set file index for filter table entry command handler @@ -114,7 +114,7 @@ void DS_CmdSetAppState(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_FILTER_FILE_CC, #DS_FilterFileCmd_t */ -void DS_CmdSetFilterFile(const CFE_SB_Buffer_t *BufPtr); +void DS_SetFilterFileCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Set filter type for filter table entry command handler @@ -138,7 +138,7 @@ void DS_CmdSetFilterFile(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_FILTER_TYPE_CC, #DS_FilterTypeCmd_t */ -void DS_CmdSetFilterType(const CFE_SB_Buffer_t *BufPtr); +void DS_SetFilterTypeCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Set filter parameters for filter table entry command handler @@ -162,7 +162,7 @@ void DS_CmdSetFilterType(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_FILTER_PARMS_CC, #DS_FilterParmsCmd_t */ -void DS_CmdSetFilterParms(const CFE_SB_Buffer_t *BufPtr); +void DS_SetFilterParmsCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Set data storage filename type command handler @@ -186,7 +186,7 @@ void DS_CmdSetFilterParms(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_DEST_TYPE_CC, #DS_DestTypeCmd_t */ -void DS_CmdSetDestType(const CFE_SB_Buffer_t *BufPtr); +void DS_SetDestTypeCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Set data storage enable/disable state command handler @@ -210,7 +210,7 @@ void DS_CmdSetDestType(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_DEST_STATE_CC, #DS_DestStateCmd_t */ -void DS_CmdSetDestState(const CFE_SB_Buffer_t *BufPtr); +void DS_SetDestStateCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Set data storage file pathname command handler @@ -234,7 +234,7 @@ void DS_CmdSetDestState(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_DEST_PATH_CC, #DS_DestPathCmd_t */ -void DS_CmdSetDestPath(const CFE_SB_Buffer_t *BufPtr); +void DS_SetDestPathCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Set data storage file basename command handler @@ -258,7 +258,7 @@ void DS_CmdSetDestPath(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_DEST_BASE_CC, #DS_DestBaseCmd_t */ -void DS_CmdSetDestBase(const CFE_SB_Buffer_t *BufPtr); +void DS_SetDestBaseCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Set data storage file extension command handler @@ -282,7 +282,7 @@ void DS_CmdSetDestBase(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_DEST_EXT_CC, #DS_DestExtCmd_t */ -void DS_CmdSetDestExt(const CFE_SB_Buffer_t *BufPtr); +void DS_SetDestExtCmd(const CFE_SB_Buffer_t *BufPtr); /** \brief Set data storage file size limit command handler * @@ -305,7 +305,7 @@ void DS_CmdSetDestExt(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_DEST_SIZE_CC, #DS_DestSizeCmd_t */ -void DS_CmdSetDestSize(const CFE_SB_Buffer_t *BufPtr); +void DS_SetDestSizeCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Set data storage file age limit command handler @@ -329,7 +329,7 @@ void DS_CmdSetDestSize(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_DEST_AGE_CC, #DS_DestAgeCmd_t */ -void DS_CmdSetDestAge(const CFE_SB_Buffer_t *BufPtr); +void DS_SetDestAgeCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Set data storage filename sequence count command handler @@ -353,7 +353,7 @@ void DS_CmdSetDestAge(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_SET_DEST_COUNT_CC, #DS_DestCountCmd_t */ -void DS_CmdSetDestCount(const CFE_SB_Buffer_t *BufPtr); +void DS_SetDestCountCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Close data storage file command handler @@ -376,7 +376,7 @@ void DS_CmdSetDestCount(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_CLOSE_FILE_CC, #DS_CloseFileCmd_t */ -void DS_CmdCloseFile(const CFE_SB_Buffer_t *BufPtr); +void DS_CloseFileCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Close all data storage files command handler @@ -398,7 +398,7 @@ void DS_CmdCloseFile(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_CLOSE_ALL_CC, #DS_CloseAllCmd_t */ -void DS_CmdCloseAll(const CFE_SB_Buffer_t *BufPtr); +void DS_CloseAllCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Get file information telemetry packet command handler @@ -419,7 +419,7 @@ void DS_CmdCloseAll(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_GET_FILE_INFO_CC, #DS_GetFileInfoCmd_t, #DS_FileInfoPkt_t */ -void DS_CmdGetFileInfo(const CFE_SB_Buffer_t *BufPtr); +void DS_GetFileInfoCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Add Message ID to Packet Filter Table @@ -442,7 +442,7 @@ void DS_CmdGetFileInfo(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_ADD_MID_CC, #DS_AddMidCmd_t */ -void DS_CmdAddMID(const CFE_SB_Buffer_t *BufPtr); +void DS_AddMIDCmd(const CFE_SB_Buffer_t *BufPtr); /** * \brief Remove Message ID from Packet Filter Table @@ -464,6 +464,6 @@ void DS_CmdAddMID(const CFE_SB_Buffer_t *BufPtr); * * \sa #DS_REMOVE_MID_CC, #DS_RemoveMidCmd_t */ -void DS_CmdRemoveMID(const CFE_SB_Buffer_t *BufPtr); +void DS_RemoveMIDCmd(const CFE_SB_Buffer_t *BufPtr); #endif diff --git a/fsw/src/ds_dispatch.c b/fsw/src/ds_dispatch.c new file mode 100644 index 0000000..c264caf --- /dev/null +++ b/fsw/src/ds_dispatch.c @@ -0,0 +1,571 @@ +/************************************************************************ + * NASA Docket No. GSC-18,917-1, and identified as “CFS Data Storage + * (DS) application version 2.6.1” + * + * Copyright (c) 2021 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + +/** + * @file + * The CFS Data Storage (DS) Application file containing the application + * initialization routines, the main routine and the command interface. + */ + +#include "cfe.h" +#include "ds_perfids.h" +#include "ds_msgids.h" +#include "ds_platform_cfg.h" +#include "ds_dispatch.h" +#include "ds_msg.h" +#include "ds_app.h" +#include "ds_cmds.h" +#include "ds_file.h" +#include "ds_table.h" +#include "ds_events.h" +#include "ds_msgdefs.h" + +#include + +/************************************************************************ + * NASA Docket No. GSC-18,917-1, and identified as “CFS Data Storage + * (DS) application version 2.6.1” + * + * Copyright (c) 2021 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + +/** + * @file + * CFS Data Storage (DS) command handler functions + */ + +#include "cfe.h" + +#include "ds_platform_cfg.h" +#include "ds_verify.h" + +#include "ds_appdefs.h" +#include "ds_msgids.h" +#include "ds_events.h" + +#include "ds_msg.h" +#include "ds_app.h" +#include "ds_cmds.h" + +#include + +bool DS_VerifyLength(const CFE_SB_Buffer_t *BufPtr, size_t ExpectedLength, uint16 FailEventID, const char *CommandName) +{ + size_t ActualLength = 0; + + CFE_MSG_GetSize(&BufPtr->Msg, &ActualLength); + + if (ExpectedLength != ActualLength) + { + /* + ** Invalid command packet length... + */ + DS_AppData.CmdRejectedCounter++; + + CFE_EVS_SendEvent(FailEventID, CFE_EVS_EventType_ERROR, + "Invalid %s command length: expected = %lu, actual = %lu", CommandName, + (unsigned long)ExpectedLength, (unsigned long)ActualLength); + } + + return (ExpectedLength == ActualLength); +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* NOOP command */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_NoopVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_NoopCmd_t), DS_NOOP_CMD_ERR_EID, "NOOP")) + { + DS_NoopCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Reset hk telemetry counters command */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_ResetVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_ResetCountersCmd_t), DS_RESET_CMD_ERR_EID, "RESET")) + { + DS_ResetCountersCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set application ena/dis state */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetAppStateVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_AppStateCmd_t), DS_ENADIS_CMD_ERR_EID, "APP STATE")) + { + DS_SetAppStateCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set packet filter file index */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetFilterFileVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_FilterFileCmd_t), DS_FILE_CMD_ERR_EID, "FILTER FILE")) + { + DS_SetFilterFileCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set pkt filter filename type */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetFilterTypeVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_FilterTypeCmd_t), DS_FTYPE_CMD_ERR_EID, "FILTER TYPE")) + { + DS_SetFilterTypeCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set packet filter parameters */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetFilterParmsVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_FilterParmsCmd_t), DS_PARMS_CMD_ERR_EID, "FILTER PARMS")) + { + DS_SetFilterParmsCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set destination filename type */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetDestTypeVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_DestTypeCmd_t), DS_NTYPE_CMD_ERR_EID, "DEST TYPE")) + { + DS_SetDestTypeCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set dest file ena/dis state */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetDestStateVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_DestStateCmd_t), DS_STATE_CMD_ERR_EID, "DEST STATE")) + { + DS_SetDestStateCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set path portion of filename */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetDestPathVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_DestPathCmd_t), DS_PATH_CMD_ERR_EID, "DEST PATH")) + { + DS_SetDestPathCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set base portion of filename */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetDestBaseVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_DestBaseCmd_t), DS_BASE_CMD_ERR_EID, "DEST BASE")) + { + DS_SetDestBaseCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set extension portion of filename */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetDestExtVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_DestExtCmd_t), DS_EXT_CMD_ERR_EID, "DEST EXT")) + { + DS_SetDestExtCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set maximum file size limit */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetDestSizeVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_DestSizeCmd_t), DS_SIZE_CMD_ERR_EID, "DEST SIZE")) + { + DS_SetDestSizeCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set maximum file age limit */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetDestAgeVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_DestAgeCmd_t), DS_AGE_CMD_ERR_EID, "DEST AGE")) + { + DS_SetDestAgeCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Set seq cnt portion of filename */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_SetDestCountVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_DestCountCmd_t), DS_SEQ_CMD_ERR_EID, "DEST COUNT")) + { + DS_SetDestCountCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Close destination file */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_CloseFileVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_CloseFileCmd_t), DS_CLOSE_CMD_ERR_EID, "DEST CLOSE")) + { + DS_CloseFileCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Close all open destination files */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_CloseAllVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_CloseAllCmd_t), DS_CLOSE_ALL_CMD_ERR_EID, "DEST CLOSE ALL")) + { + DS_CloseAllCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Get file info packet */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_GetFileInfoVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_GetFileInfoCmd_t), DS_GET_FILE_INFO_CMD_ERR_EID, "GET FILE INFO")) + { + DS_GetFileInfoCmd(BufPtr); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Add message ID to packet filter table */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_AddMIDVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_AddMidCmd_t), DS_ADD_MID_CMD_ERR_EID, "ADD MID")) + { + DS_AddMIDCmd(BufPtr); + } +} + +void DS_RemoveMIDVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_RemoveMidCmd_t), DS_REMOVE_MID_CMD_ERR_EID, "REMOVE MID")) + { + DS_RemoveMIDCmd(BufPtr); + } +} + +void DS_SendHkVerifyDispatch(const CFE_SB_Buffer_t *BufPtr) +{ + if (DS_VerifyLength(BufPtr, sizeof(DS_SendHkCmd_t), DS_HK_REQUEST_ERR_EID, "SEND HK")) + { + DS_AppSendHkCmd(); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Process Software Bus messages */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_AppProcessMsg(const CFE_SB_Buffer_t *BufPtr) +{ + CFE_SB_MsgId_t MessageID = CFE_SB_INVALID_MSG_ID; + + CFE_MSG_GetMsgId(&BufPtr->Msg, &MessageID); + + switch (CFE_SB_MsgIdToValue(MessageID)) + { + /* + ** DS application commands... + */ + case DS_CMD_MID: + DS_AppProcessCmd(BufPtr); + if (DS_TableFindMsgID(MessageID) != DS_INDEX_NONE) + { + DS_AppStorePacket(MessageID, BufPtr); + } + break; + + /* + ** DS housekeeping request command... + */ + case DS_SEND_HK_MID: + DS_SendHkVerifyDispatch(BufPtr); + if (DS_TableFindMsgID(MessageID) != DS_INDEX_NONE) + { + DS_AppStorePacket(MessageID, BufPtr); + } + break; + + /* + ** Unknown message ID's (must be something to store)... + */ + default: + DS_AppStorePacket(MessageID, BufPtr); + break; + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/* */ +/* Process application commands */ +/* */ +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ + +void DS_AppProcessCmd(const CFE_SB_Buffer_t *BufPtr) +{ + CFE_MSG_FcnCode_t CommandCode = 0; + + CFE_MSG_GetFcnCode(&BufPtr->Msg, &CommandCode); + + switch (CommandCode) + { + /* + ** Do nothing command (aliveness test)... + */ + case DS_NOOP_CC: + DS_NoopVerifyDispatch(BufPtr); + break; + + /* + ** Set housekeeping telemetry counters to zero... + */ + case DS_RESET_COUNTERS_CC: + DS_ResetVerifyDispatch(BufPtr); + break; + + /* + ** Set DS application enable/disable state... + */ + case DS_SET_APP_STATE_CC: + DS_SetAppStateVerifyDispatch(BufPtr); + break; + + /* + ** Set packet filter file index... + */ + case DS_SET_FILTER_FILE_CC: + DS_SetFilterFileVerifyDispatch(BufPtr); + break; + + /* + ** Set packet filter type (time vs count)... + */ + case DS_SET_FILTER_TYPE_CC: + DS_SetFilterTypeVerifyDispatch(BufPtr); + break; + + /* + ** Set packet filter algorithm parameters... + */ + case DS_SET_FILTER_PARMS_CC: + DS_SetFilterParmsVerifyDispatch(BufPtr); + break; + + /* + ** Set destination file filename type (time vs count)... + */ + case DS_SET_DEST_TYPE_CC: + DS_SetDestTypeVerifyDispatch(BufPtr); + break; + + /* + ** Set destination file enable/disable state... + */ + case DS_SET_DEST_STATE_CC: + DS_SetDestStateVerifyDispatch(BufPtr); + break; + + /* + ** Set destination file path portion of filename... + */ + case DS_SET_DEST_PATH_CC: + DS_SetDestPathVerifyDispatch(BufPtr); + break; + + /* + ** Set destination file base portion of filename... + */ + case DS_SET_DEST_BASE_CC: + DS_SetDestBaseVerifyDispatch(BufPtr); + break; + + /* + ** Set destination file extension portion of filename... + */ + case DS_SET_DEST_EXT_CC: + DS_SetDestExtVerifyDispatch(BufPtr); + break; + + /* + ** Set destination file maximum size limit... + */ + case DS_SET_DEST_SIZE_CC: + DS_SetDestSizeVerifyDispatch(BufPtr); + break; + + /* + ** Set destination file maximum age limit... + */ + case DS_SET_DEST_AGE_CC: + DS_SetDestAgeVerifyDispatch(BufPtr); + break; + + /* + ** Set destination file sequence count portion of filename... + */ + case DS_SET_DEST_COUNT_CC: + DS_SetDestCountVerifyDispatch(BufPtr); + break; + + /* + ** Close destination file (next packet will re-open)... + */ + case DS_CLOSE_FILE_CC: + DS_CloseFileVerifyDispatch(BufPtr); + break; + + /* + ** Get file info telemetry packet... + */ + case DS_GET_FILE_INFO_CC: + DS_GetFileInfoVerifyDispatch(BufPtr); + break; + + /* + ** Add message ID to filter table... + */ + case DS_ADD_MID_CC: + DS_AddMIDVerifyDispatch(BufPtr); + break; + + /* + ** Remove message ID from filter table... + */ + case DS_REMOVE_MID_CC: + DS_RemoveMIDVerifyDispatch(BufPtr); + break; + + /* + ** Close all destination files (next packet will re-open)... + */ + case DS_CLOSE_ALL_CC: + DS_CloseAllVerifyDispatch(BufPtr); + break; + + /* + ** DS application command with unknown command code... + */ + default: + CFE_EVS_SendEvent(DS_CMD_CODE_ERR_EID, CFE_EVS_EventType_ERROR, + "Invalid command code: MID = 0x%08X, CC = %d", DS_CMD_MID, CommandCode); + + DS_AppData.CmdRejectedCounter++; + break; + } +} diff --git a/fsw/src/ds_dispatch.h b/fsw/src/ds_dispatch.h new file mode 100644 index 0000000..26e1845 --- /dev/null +++ b/fsw/src/ds_dispatch.h @@ -0,0 +1,61 @@ +/************************************************************************ + * NASA Docket No. GSC-18,917-1, and identified as “CFS Data Storage + * (DS) application version 2.6.1” + * + * Copyright (c) 2021 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + +/** + * @file + * The CFS Data Storage (DS) dispatch header file + */ +#ifndef DS_DISPATCH_H +#define DS_DISPATCH_H + +#include "cfe.h" +#include "ds_platform_cfg.h" + +/** + * \brief Software Bus message handler + * + * \par Description + * Process packets received via Software Bus message pipe + * - may call application housekeeping request command handler + * - may call 1Hz wakeup command handler (if enabled) + * - may call application ground command handler + * All packets are processed for possible data storage + * + * \par Assumptions, External Events, and Notes: + * (none) + * + * \param[in] BufPtr Software Bus message pointer + */ +void DS_AppProcessMsg(const CFE_SB_Buffer_t *BufPtr); + +/** + * \brief Application ground command handler + * + * \par Description + * Call command code specific DS command handler function + * Generate command error event for unknown command codes + * + * \par Assumptions, External Events, and Notes: + * (none) + * + * \param[in] BufPtr Software Bus message pointer + */ +void DS_AppProcessCmd(const CFE_SB_Buffer_t *BufPtr); + +#endif diff --git a/unit-test/CMakeLists.txt b/unit-test/CMakeLists.txt index d00967b..f6552a9 100644 --- a/unit-test/CMakeLists.txt +++ b/unit-test/CMakeLists.txt @@ -11,6 +11,7 @@ add_cfe_coverage_stubs("ds_internal" utilities/ds_test_utils.c stubs/ds_app_stubs.c stubs/ds_cmds_stubs.c + stubs/ds_dispatch_stubs.c stubs/ds_file_stubs.c stubs/ds_global_stubs.c stubs/ds_table_stubs.c diff --git a/unit-test/ds_app_tests.c b/unit-test/ds_app_tests.c index 0317f33..d99e30d 100644 --- a/unit-test/ds_app_tests.c +++ b/unit-test/ds_app_tests.c @@ -251,527 +251,7 @@ void DS_AppInitialize_Test_SBSubscribeDSError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); } -void DS_AppProcessMsg_Test_CmdStore(void) -{ - DS_HashLink_t HashLink; - size_t forced_Size = sizeof(DS_NoopCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_NOOP_CC; - - DS_AppData.AppEnableState = DS_DISABLED; - - DS_AppData.HashTable[187] = &HashLink; - HashLink.Index = 0; - DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), 1); - - /* Execute the function being tested */ - DS_AppProcessMsg(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); - - /* Verifying that the DisabledPktCounter == 1 confirms that an attempt was - * made to store this packet (setting AppEnableState to DS_DISABLED forces - * this counter to increment when the attempt is made). */ - UtAssert_INT32_EQ(DS_AppData.DisabledPktCounter, 1); - - /* event message that would normally be sent by noop in production code is - * stubbed out for the purposes of this test */ -} - -void DS_AppProcessMsg_Test_CmdNoStore(void) -{ - DS_HashLink_t HashLink; - size_t forced_Size = sizeof(DS_NoopCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_NOOP_CC; - - DS_AppData.AppEnableState = DS_DISABLED; - - DS_AppData.HashTable[187] = &HashLink; - HashLink.Index = 0; - DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), DS_INDEX_NONE); - - /* Execute the function being tested */ - DS_AppProcessMsg(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); - - /* Verifying that the DisabledPktCounter == 0 confirms that no attempt was - * made to store this packet (setting AppEnableState to DS_DISABLED forces - * this counter to increment when the attempt is made). */ - UtAssert_INT32_EQ(DS_AppData.DisabledPktCounter, 0); - - /* event message that would normally be sent by noop in production code is - * stubbed out for the purposes of this test */ -} - -void DS_AppProcessMsg_Test_HKStore(void) -{ - DS_HashLink_t HashLink; - size_t forced_Size = sizeof(DS_NoopCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_SEND_HK_MID); - - DS_AppData.AppEnableState = DS_DISABLED; - - DS_AppData.HashTable[188] = &HashLink; - HashLink.Index = 0; - DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - - UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), 1); - - /* Execute the function being tested */ - DS_AppProcessMsg(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(CFE_SB_TransmitMsg, 1); - /* verifying a sent message indirectly verifies that DS_AppProcessHK was - * called */ - - /* Verifying that the DisabledPktCounter == 1 confirms that an attempt was - * made to store this packet (setting AppEnableState to DS_DISABLED forces - * this counter to increment when the attempt is made). */ - UtAssert_INT32_EQ(DS_AppData.DisabledPktCounter, 1); - - UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); -} - -void DS_AppProcessMsg_Test_HKNoStore(void) -{ - DS_HashLink_t HashLink; - size_t forced_Size = sizeof(DS_NoopCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_SEND_HK_MID); - - DS_AppData.AppEnableState = DS_DISABLED; - - DS_AppData.HashTable[188] = &HashLink; - HashLink.Index = 0; - DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - - UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), DS_INDEX_NONE); - - /* Execute the function being tested */ - DS_AppProcessMsg(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(CFE_SB_TransmitMsg, 1); - /* verifying a sent message indirectly verifies that DS_AppProcessHK was - * called */ - - /* Verifying that the DisabledPktCounter == 0 confirms that no attempt was - * made to store this packet (setting AppEnableState to DS_DISABLED forces - * this counter to increment when the attempt is made). */ - UtAssert_INT32_EQ(DS_AppData.DisabledPktCounter, 0); - - UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); -} - -void DS_AppProcessMsg_Test_HKInvalidRequest(void) -{ - size_t forced_Size = 0; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_SEND_HK_MID); - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - - /* Execute the function being tested */ - DS_AppProcessMsg(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_HK_REQUEST_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); -} - -void DS_AppProcessMsg_Test_UnknownMID(void) -{ - size_t forced_Size = 0; - CFE_SB_MsgId_t forced_MsgID = DS_UT_MID_1; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - - /* Execute the function being tested */ - DS_AppProcessMsg(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); -} - -void DS_AppProcessCmd_Test_Noop(void) -{ - size_t forced_Size = sizeof(DS_NoopCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_NOOP_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdNoop, 1); -} - -void DS_AppProcessCmd_Test_Reset(void) -{ - size_t forced_Size = sizeof(DS_ResetCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_RESET_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdReset, 1); -} - -void DS_AppProcessCmd_Test_SetAppState(void) -{ - size_t forced_Size = sizeof(DS_AppStateCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_APP_STATE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetAppState, 1); -} - -void DS_AppProcessCmd_Test_SetFilterFile(void) -{ - size_t forced_Size = sizeof(DS_FilterFileCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_FILE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetFilterFile, 1); -} - -void DS_AppProcessCmd_Test_SetFilterType(void) -{ - size_t forced_Size = sizeof(DS_FilterTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_TYPE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetFilterType, 1); -} - -void DS_AppProcessCmd_Test_SetFilterParms(void) -{ - size_t forced_Size = sizeof(DS_FilterParmsCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_PARMS_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetFilterParms, 1); -} - -void DS_AppProcessCmd_Test_SetDestType(void) -{ - size_t forced_Size = sizeof(DS_DestTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_TYPE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetDestType, 1); -} - -void DS_AppProcessCmd_Test_SetDestState(void) -{ - size_t forced_Size = sizeof(DS_DestStateCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_STATE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetDestState, 1); -} - -void DS_AppProcessCmd_Test_SetDestPath(void) -{ - size_t forced_Size = sizeof(DS_DestPathCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_PATH_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetDestPath, 1); -} - -void DS_AppProcessCmd_Test_SetDestBase(void) -{ - size_t forced_Size = sizeof(DS_DestBaseCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_BASE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetDestBase, 1); -} - -void DS_AppProcessCmd_Test_SetDestExt(void) -{ - size_t forced_Size = sizeof(DS_DestExtCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_EXT_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetDestExt, 1); -} - -void DS_AppProcessCmd_Test_SetDestSize(void) -{ - size_t forced_Size = sizeof(DS_DestSizeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_SIZE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetDestSize, 1); -} - -void DS_AppProcessCmd_Test_SetDestAge(void) -{ - size_t forced_Size = sizeof(DS_DestAgeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_AGE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetDestAge, 1); -} - -void DS_AppProcessCmd_Test_SetDestCount(void) -{ - size_t forced_Size = sizeof(DS_DestCountCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_COUNT_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdSetDestCount, 1); -} - -void DS_AppProcessCmd_Test_CloseFile(void) -{ - uint32 i; - size_t forced_Size = sizeof(DS_CloseFileCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_CLOSE_FILE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - for (i = 0; i < DS_DEST_FILE_CNT; i++) - { - DS_AppData.FileStatus[i].FileHandle = OS_OBJECT_ID_UNDEFINED; - } - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdCloseFile, 1); -} - -void DS_AppProcessCmd_Test_GetFileInfo(void) -{ - size_t forced_Size = sizeof(DS_GetFileInfoCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_GET_FILE_INFO_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdGetFileInfo, 1); -} - -void DS_AppProcessCmd_Test_AddMID(void) -{ - size_t forced_Size = sizeof(DS_AddMidCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_ADD_MID_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdAddMID, 1); -} - -void DS_AppProcessCmd_Test_RemoveMID(void) -{ - size_t forced_Size = sizeof(DS_RemoveMidCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_REMOVE_MID_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdRemoveMID, 1); -} - -void DS_AppProcessCmd_Test_CloseAll(void) -{ - uint32 i; - size_t forced_Size = sizeof(DS_CloseAllCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_CLOSE_ALL_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - for (i = 0; i < DS_DEST_FILE_CNT; i++) - { - DS_AppData.FileStatus[i].FileHandle = OS_OBJECT_ID_UNDEFINED; - } - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_STUB_COUNT(DS_CmdCloseAll, 1); -} - -void DS_AppProcessCmd_Test_InvalidCommandCode(void) -{ - size_t forced_Size = sizeof(DS_CloseAllCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = 99; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - /* Execute the function being tested */ - DS_AppProcessCmd(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); - - UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); -} - -void DS_AppProcessHK_Test(void) +void DS_AppSendHkCmd_Test(void) { uint32 i; @@ -783,7 +263,7 @@ void DS_AppProcessHK_Test(void) } /* Execute the function being tested */ - DS_AppProcessHK(); + DS_AppSendHkCmd(); /* Verify results */ UtAssert_UINT32_EQ(DS_AppData.FileStatus[0].FileRate, 99 / DS_SECS_PER_HK_CYCLE); @@ -803,7 +283,7 @@ void DS_AppProcessHK_Test(void) UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } -void DS_AppProcessHK_Test_SnprintfFail(void) +void DS_AppSendHkCmd_Test_SnprintfFail(void) { uint32 i; @@ -817,7 +297,7 @@ void DS_AppProcessHK_Test_SnprintfFail(void) UT_SetDeferredRetcode(UT_KEY(stub_snprintf), 1, -1); /* Execute the function being tested */ - DS_AppProcessHK(); + DS_AppSendHkCmd(); /* Verify results */ UtAssert_UINT32_EQ(DS_AppData.FileStatus[0].FileRate, 99 / DS_SECS_PER_HK_CYCLE); @@ -839,7 +319,7 @@ void DS_AppProcessHK_Test_SnprintfFail(void) UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } -void DS_AppProcessHK_Test_TblFail(void) +void DS_AppSendHkCmd_Test_TblFail(void) { uint32 i; @@ -853,7 +333,7 @@ void DS_AppProcessHK_Test_TblFail(void) UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_GetInfo), -1); /* Execute the function being tested */ - DS_AppProcessHK(); + DS_AppSendHkCmd(); /* Verify results */ UtAssert_UINT32_EQ(DS_AppData.FileStatus[0].FileRate, 99 / DS_SECS_PER_HK_CYCLE); @@ -978,37 +458,9 @@ void UtTest_Setup(void) UT_DS_TEST_ADD(DS_AppInitialize_Test_SBSubscribeHKError); UT_DS_TEST_ADD(DS_AppInitialize_Test_SBSubscribeDSError); - UT_DS_TEST_ADD(DS_AppProcessMsg_Test_CmdStore); - UT_DS_TEST_ADD(DS_AppProcessMsg_Test_CmdNoStore); - UT_DS_TEST_ADD(DS_AppProcessMsg_Test_HKStore); - UT_DS_TEST_ADD(DS_AppProcessMsg_Test_HKNoStore); - UT_DS_TEST_ADD(DS_AppProcessMsg_Test_HKInvalidRequest); - UT_DS_TEST_ADD(DS_AppProcessMsg_Test_UnknownMID); - - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_Noop); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_Reset); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetAppState); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetFilterFile); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetFilterType); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetFilterParms); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestType); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestState); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestPath); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestBase); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestExt); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestSize); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestAge); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestCount); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_CloseFile); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_GetFileInfo); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_AddMID); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_RemoveMID); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_CloseAll); - UT_DS_TEST_ADD(DS_AppProcessCmd_Test_InvalidCommandCode); - - UT_DS_TEST_ADD(DS_AppProcessHK_Test); - UT_DS_TEST_ADD(DS_AppProcessHK_Test_SnprintfFail); - UT_DS_TEST_ADD(DS_AppProcessHK_Test_TblFail); + UT_DS_TEST_ADD(DS_AppSendHkCmd_Test); + UT_DS_TEST_ADD(DS_AppSendHkCmd_Test_SnprintfFail); + UT_DS_TEST_ADD(DS_AppSendHkCmd_Test_TblFail); UT_DS_TEST_ADD(DS_AppStorePacket_Test_Nominal); UT_DS_TEST_ADD(DS_AppStorePacket_Test_DSDisabled); diff --git a/unit-test/ds_cmds_tests.c b/unit-test/ds_cmds_tests.c index 5fc0f9e..a089a32 100644 --- a/unit-test/ds_cmds_tests.c +++ b/unit-test/ds_cmds_tests.c @@ -48,299 +48,105 @@ #define CMD_STRUCT_DATA_IS_32_ALIGNED(x) ((sizeof(x) - sizeof(CFE_MSG_CommandHeader_t)) % 4) == 0 #define TLM_STRUCT_DATA_IS_32_ALIGNED(x) ((sizeof(x) - sizeof(CFE_MSG_TelemetryHeader_t)) % 4) == 0 -uint8 call_count_CFE_EVS_SendEvent; - /* * Function Definitions */ -void DS_CmdNoop_Test_Nominal(void) +void DS_NoopCmd_Test_Nominal(void) { - size_t forced_Size = sizeof(DS_NoopCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_NOOP_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "NOOP command, Version %%d.%%d.%%d.%%d"); - /* Execute the function being tested */ - DS_CmdNoop(&UT_CmdBuf.Buf); + DS_NoopCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_NOOP_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_NoopCmd_t), "DS_NoopCmd_t is 32-bit aligned"); } -void DS_CmdNoop_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_NoopCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_NOOP_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid NOOP command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdNoop(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_NOOP_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - 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_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); -} - -void DS_CmdReset_Test_Nominal(void) +void DS_ResetCountersCmd_Test_Nominal(void) { - size_t forced_Size = sizeof(DS_ResetCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_RESET_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Reset counters command"); - /* Execute the function being tested */ - DS_CmdReset(&UT_CmdBuf.Buf); + DS_ResetCountersCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 0, "DS_AppData.CmdAcceptedCounter == 0"); - UtAssert_True(DS_AppData.CmdRejectedCounter == 0, "DS_AppData.CmdRejectedCounter == 0"); - UtAssert_True(DS_AppData.DisabledPktCounter == 0, "DS_AppData.DisabledPktCounter == 0"); - UtAssert_True(DS_AppData.IgnoredPktCounter == 0, "DS_AppData.IgnoredPktCounter == 0"); - UtAssert_True(DS_AppData.FilteredPktCounter == 0, "DS_AppData.FilteredPktCounter == 0"); - UtAssert_True(DS_AppData.PassedPktCounter == 0, "DS_AppData.PassedPktCounter == 0"); - UtAssert_True(DS_AppData.FileWriteCounter == 0, "DS_AppData.FileWriteCounter == 0"); - UtAssert_True(DS_AppData.FileWriteErrCounter == 0, "DS_AppData.FileWriteErrCounter == 0"); - UtAssert_True(DS_AppData.FileUpdateCounter == 0, "DS_AppData.FileUpdateCounter == 0"); - UtAssert_True(DS_AppData.FileUpdateErrCounter == 0, "DS_AppData.FileUpdateErrCounter == 0"); - UtAssert_True(DS_AppData.DestTblLoadCounter == 0, "DS_AppData.DestTblLoadCounter == 0"); - UtAssert_True(DS_AppData.DestTblErrCounter == 0, "DS_AppData.DestTblErrCounter == 0"); - UtAssert_True(DS_AppData.FilterTblLoadCounter == 0, "DS_AppData.FilterTblLoadCounter == 0"); - UtAssert_True(DS_AppData.FilterTblErrCounter == 0, "DS_AppData.FilterTblErrCounter == 0"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_ZERO(DS_AppData.CmdAcceptedCounter); + UtAssert_ZERO(DS_AppData.CmdRejectedCounter); + UtAssert_ZERO(DS_AppData.DisabledPktCounter); + UtAssert_ZERO(DS_AppData.IgnoredPktCounter); + UtAssert_ZERO(DS_AppData.FilteredPktCounter); + UtAssert_ZERO(DS_AppData.PassedPktCounter); + UtAssert_ZERO(DS_AppData.FileWriteCounter); + UtAssert_ZERO(DS_AppData.FileWriteErrCounter); + UtAssert_ZERO(DS_AppData.FileUpdateCounter); + UtAssert_ZERO(DS_AppData.FileUpdateErrCounter); + UtAssert_ZERO(DS_AppData.DestTblLoadCounter); + UtAssert_ZERO(DS_AppData.DestTblErrCounter); + UtAssert_ZERO(DS_AppData.FilterTblLoadCounter); + UtAssert_ZERO(DS_AppData.FilterTblErrCounter); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_RESET_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ - UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_ResetCmd_t), "DS_ResetCmd_t is 32-bit aligned"); + UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_ResetCountersCmd_t), "DS_ResetCountersCmd_t is 32-bit aligned"); } -void DS_CmdReset_Test_InvalidCommandLength(void) +void DS_SetAppStateCmd_Test_Nominal(void) { - size_t forced_Size = sizeof(DS_ResetCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_RESET_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid RESET command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdReset(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_RESET_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - 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_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); -} - -void DS_CmdSetAppState_Test_Nominal(void) -{ - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "APP STATE command: state = %%d"); DS_AppState_Payload_t *CmdPayload = &UT_CmdBuf.AppStateCmd.Payload; - size_t forced_Size = sizeof(DS_AppStateCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_APP_STATE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - CmdPayload->EnableState = true; UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyState), true); /* Execute the function being tested */ - DS_CmdSetAppState(&UT_CmdBuf.Buf); + DS_SetAppStateCmd(&UT_CmdBuf.Buf); /* Verify results */ UtAssert_INT32_EQ(DS_AppData.CmdRejectedCounter, 0); UtAssert_INT32_EQ(DS_AppData.CmdAcceptedCounter, 1); UtAssert_True(DS_AppData.AppEnableState == true, "DS_AppData.AppEnableState == true"); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_ENADIS_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - 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_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_AppStateCmd_t), "DS_AppStateCmd_t is 32-bit aligned"); } -void DS_CmdSetAppState_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_AppStateCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_APP_STATE_CC; - DS_AppState_Payload_t *CmdPayload = &UT_CmdBuf.AppStateCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid APP STATE command length: expected = %%d, actual = %%d"); - - CmdPayload->EnableState = true; - - /* Execute the function being tested */ - DS_CmdSetAppState(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_ENADIS_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - 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_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); -} - -void DS_CmdSetAppState_Test_InvalidAppState(void) +void DS_SetAppStateCmd_Test_InvalidAppState(void) { - size_t forced_Size = sizeof(DS_AppStateCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_APP_STATE_CC; - DS_AppState_Payload_t *CmdPayload = &UT_CmdBuf.AppStateCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Invalid APP STATE command arg: app state = %%d"); + DS_AppState_Payload_t *CmdPayload = &UT_CmdBuf.AppStateCmd.Payload; CmdPayload->EnableState = 99; /* Execute the function being tested */ - DS_CmdSetAppState(&UT_CmdBuf.Buf); + DS_SetAppStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_ENADIS_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - 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_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); } -void DS_CmdSetFilterFile_Test_Nominal(void) +void DS_SetFilterFileCmd_Test_Nominal(void) { - DS_HashLink_t HashLink; - - size_t forced_Size = sizeof(DS_FilterFileCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_FILE_CC; int32 forced_FilterTableIndex = 1; DS_FilterFile_Payload_t *CmdPayload = &UT_CmdBuf.FilterFileCmd.Payload; - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "FILTER FILE command: MID = 0x%%08lX, index = %%d, filter = %%d, file = %%d"); - CmdPayload->FilterParmsIndex = 2; CmdPayload->MessageID = DS_UT_MID_1; CmdPayload->FileTableIndex = 4; - DS_AppData.HashTable[187] = &HashLink; - HashLink.Index = 0; DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; DS_AppData.FilterTblPtr->Packet[forced_FilterTableIndex].Filter[CmdPayload->FilterParmsIndex].FileTableIndex = 0; @@ -348,10 +154,10 @@ void DS_CmdSetFilterFile_Test_Nominal(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), forced_FilterTableIndex); /* Execute the function being tested */ - DS_CmdSetFilterFile(&UT_CmdBuf.Buf); + DS_SetFilterFileCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); UtAssert_True( DS_AppData.FilterTblPtr->Packet[forced_FilterTableIndex].Filter[CmdPayload->FilterParmsIndex].FileTableIndex == @@ -359,180 +165,71 @@ void DS_CmdSetFilterFile_Test_Nominal(void) "DS_AppData.FilterTblPtr->Packet[forced_FilterTableIndex].Filter[CmdPayload->" "FilterParmsIndex].FileTableIndex == CmdPayload->FileTableIndex"); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FILE_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_FilterFileCmd_t), "DS_FilterFileCmd_t is 32-bit aligned"); } -void DS_CmdSetFilterFile_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_FilterFileCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_FILE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER FILE command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdSetFilterFile(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FILE_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdSetFilterFile_Test_InvalidMessageID(void) +void DS_SetFilterFileCmd_Test_InvalidMessageID(void) { - size_t forced_Size = sizeof(DS_FilterFileCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_FILE_CC; - DS_FilterFile_Payload_t *CmdPayload = &UT_CmdBuf.FilterFileCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER FILE command arg: invalid messageID = 0x%%08lX"); + DS_FilterFile_Payload_t *CmdPayload = &UT_CmdBuf.FilterFileCmd.Payload; CmdPayload->MessageID = CFE_SB_INVALID_MSG_ID; /* Execute the function being tested */ - DS_CmdSetFilterFile(&UT_CmdBuf.Buf); + DS_SetFilterFileCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FILE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterFile_Test_InvalidFilterParametersIndex(void) +void DS_SetFilterFileCmd_Test_InvalidFilterParametersIndex(void) { - size_t forced_Size = sizeof(DS_FilterFileCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_FILE_CC; - DS_FilterFile_Payload_t *CmdPayload = &UT_CmdBuf.FilterFileCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER FILE command arg: filter parameters index = %%d"); + DS_FilterFile_Payload_t *CmdPayload = &UT_CmdBuf.FilterFileCmd.Payload; CmdPayload->MessageID = DS_UT_MID_1; CmdPayload->FilterParmsIndex = DS_FILTERS_PER_PACKET; /* Execute the function being tested */ - DS_CmdSetFilterFile(&UT_CmdBuf.Buf); + DS_SetFilterFileCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FILE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterFile_Test_InvalidFileTableIndex(void) +void DS_SetFilterFileCmd_Test_InvalidFileTableIndex(void) { - size_t forced_Size = sizeof(DS_FilterFileCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_FILE_CC; - DS_FilterFile_Payload_t *CmdPayload = &UT_CmdBuf.FilterFileCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER FILE command arg: file table index = %%d"); + DS_FilterFile_Payload_t *CmdPayload = &UT_CmdBuf.FilterFileCmd.Payload; CmdPayload->MessageID = DS_UT_MID_1; CmdPayload->FilterParmsIndex = 1; CmdPayload->FileTableIndex = 99; /* Execute the function being tested */ - DS_CmdSetFilterFile(&UT_CmdBuf.Buf); + DS_SetFilterFileCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FILE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterFile_Test_FilterTableNotLoaded(void) +void DS_SetFilterFileCmd_Test_FilterTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_FilterFileCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_FILE_CC; - DS_FilterFile_Payload_t *CmdPayload = &UT_CmdBuf.FilterFileCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER FILE command: packet filter table is not loaded"); + DS_FilterFile_Payload_t *CmdPayload = &UT_CmdBuf.FilterFileCmd.Payload; CmdPayload->MessageID = DS_UT_MID_1; CmdPayload->FilterParmsIndex = 1; @@ -544,279 +241,125 @@ void DS_CmdSetFilterFile_Test_FilterTableNotLoaded(void) DS_AppData.FilterTblPtr = NULL; /* Execute the function being tested */ - DS_CmdSetFilterFile(&UT_CmdBuf.Buf); + DS_SetFilterFileCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FILE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterFile_Test_MessageIDNotInFilterTable(void) +void DS_SetFilterFileCmd_Test_MessageIDNotInFilterTable(void) { - DS_HashLink_t HashLink; - - size_t forced_Size = sizeof(DS_FilterFileCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_FILE_CC; - DS_FilterFile_Payload_t *CmdPayload = &UT_CmdBuf.FilterFileCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER FILE command: Message ID 0x%%08lX is not in filter table"); + DS_FilterFile_Payload_t *CmdPayload = &UT_CmdBuf.FilterFileCmd.Payload; CmdPayload->FilterParmsIndex = 2; CmdPayload->MessageID = DS_UT_MID_2; CmdPayload->FileTableIndex = 4; - DS_AppData.HashTable[187] = &HashLink; - HashLink.Index = 0; DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), DS_INDEX_NONE); /* Execute the function being tested */ - DS_CmdSetFilterFile(&UT_CmdBuf.Buf); + DS_SetFilterFileCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FILE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterType_Test_Nominal(void) +void DS_SetFilterTypeCmd_Test_Nominal(void) { - DS_HashLink_t HashLink; - - size_t forced_Size = sizeof(DS_FilterTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_TYPE_CC; - DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "FILTER TYPE command: MID = 0x%%08lX, index = %%d, filter = %%d, type = %%d"); + DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; CmdPayload->FilterParmsIndex = 2; CmdPayload->MessageID = DS_UT_MID_1; CmdPayload->FilterType = 1; - DS_AppData.HashTable[187] = &HashLink; - HashLink.Index = 0; DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyType), true); /* Execute the function being tested */ - DS_CmdSetFilterType(&UT_CmdBuf.Buf); + DS_SetFilterTypeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); - - UtAssert_True(DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].FilterType == 1, - "DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].FilterType == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].FilterType, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FTYPE_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_FilterTypeCmd_t), "DS_FilterTypeCmd_t is 32-bit aligned"); } -void DS_CmdSetFilterType_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_FilterTypeCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_TYPE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER TYPE command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdSetFilterType(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FTYPE_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdSetFilterType_Test_InvalidMessageID(void) +void DS_SetFilterTypeCmd_Test_InvalidMessageID(void) { - size_t forced_Size = sizeof(DS_FilterTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_TYPE_CC; - DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER TYPE command arg: invalid messageID = 0x%%08lX"); + DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; CmdPayload->MessageID = CFE_SB_INVALID_MSG_ID; /* Execute the function being tested */ - DS_CmdSetFilterType(&UT_CmdBuf.Buf); + DS_SetFilterTypeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FTYPE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterType_Test_InvalidFilterParametersIndex(void) +void DS_SetFilterTypeCmd_Test_InvalidFilterParametersIndex(void) { - size_t forced_Size = sizeof(DS_FilterTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_TYPE_CC; - DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER TYPE command arg: filter parameters index = %%d"); + DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; CmdPayload->MessageID = DS_UT_MID_1; CmdPayload->FilterParmsIndex = DS_FILTERS_PER_PACKET; /* Execute the function being tested */ - DS_CmdSetFilterType(&UT_CmdBuf.Buf); + DS_SetFilterTypeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FTYPE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterType_Test_InvalidFilterType(void) +void DS_SetFilterTypeCmd_Test_InvalidFilterType(void) { - size_t forced_Size = sizeof(DS_FilterTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_TYPE_CC; - DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER TYPE command arg: filter type = %%d"); + DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; CmdPayload->MessageID = DS_UT_MID_1; CmdPayload->FilterParmsIndex = 1; CmdPayload->FilterType = false; /* Execute the function being tested */ - DS_CmdSetFilterType(&UT_CmdBuf.Buf); + DS_SetFilterTypeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FTYPE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterType_Test_FilterTableNotLoaded(void) +void DS_SetFilterTypeCmd_Test_FilterTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_FilterTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_TYPE_CC; - DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER TYPE command: packet filter table is not loaded"); + DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; CmdPayload->MessageID = DS_UT_MID_1; CmdPayload->FilterParmsIndex = 1; @@ -828,86 +371,41 @@ void DS_CmdSetFilterType_Test_FilterTableNotLoaded(void) DS_AppData.FilterTblPtr = NULL; /* Execute the function being tested */ - DS_CmdSetFilterType(&UT_CmdBuf.Buf); + DS_SetFilterTypeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FTYPE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterType_Test_MessageIDNotInFilterTable(void) +void DS_SetFilterTypeCmd_Test_MessageIDNotInFilterTable(void) { - DS_HashLink_t HashLink; - - size_t forced_Size = sizeof(DS_FilterTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_TYPE_CC; - DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER TYPE command: Message ID 0x%%08lX is not in filter table"); + DS_FilterType_Payload_t *CmdPayload = &UT_CmdBuf.FilterTypeCmd.Payload; CmdPayload->MessageID = DS_UT_MID_2; CmdPayload->FilterParmsIndex = 1; CmdPayload->FilterType = 1; - DS_AppData.HashTable[187] = &HashLink; - HashLink.Index = 0; - DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; - UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyType), true); UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), DS_INDEX_NONE); /* Execute the function being tested */ - DS_CmdSetFilterType(&UT_CmdBuf.Buf); + DS_SetFilterTypeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_FTYPE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterParms_Test_Nominal(void) +void DS_SetFilterParmsCmd_Test_Nominal(void) { - DS_HashLink_t HashLink; - - size_t forced_Size = sizeof(DS_FilterParmsCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_PARMS_CC; - DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "FILTER PARMS command: MID = 0x%%08lX, index = %%d, filter = %%d, N = %%d, X = %%d, O = %%d"); + DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; CmdPayload->FilterParmsIndex = 2; CmdPayload->MessageID = DS_UT_MID_1; @@ -915,165 +413,64 @@ void DS_CmdSetFilterParms_Test_Nominal(void) CmdPayload->Algorithm_X = 0; CmdPayload->Algorithm_O = 0; - DS_AppData.HashTable[187] = &HashLink; - HashLink.Index = 0; - DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; - UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyParms), true); /* Execute the function being tested */ - DS_CmdSetFilterParms(&UT_CmdBuf.Buf); + DS_SetFilterParmsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].Algorithm_N == 0, - "DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].Algorithm_N == 0"); - - UtAssert_True(DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].Algorithm_X == 0, - "DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].Algorithm_X == 0"); - - UtAssert_True(DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].Algorithm_O == 0, - "DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].Algorithm_O == 0"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].Algorithm_N); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].Algorithm_X); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[0].Filter[CmdPayload->FilterParmsIndex].Algorithm_O); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_PARMS_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_FilterParmsCmd_t), "DS_FilterParmsCmd_t is 32-bit aligned"); } -void DS_CmdSetFilterParms_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_FilterParmsCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_PARMS_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER PARMS command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdSetFilterParms(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_PARMS_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdSetFilterParms_Test_InvalidMessageID(void) +void DS_SetFilterParmsCmd_Test_InvalidMessageID(void) { - size_t forced_Size = sizeof(DS_FilterParmsCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_PARMS_CC; - DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER PARMS command arg: invalid messageID = 0x%%08lX"); + DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; CmdPayload->MessageID = CFE_SB_INVALID_MSG_ID; /* Execute the function being tested */ - DS_CmdSetFilterParms(&UT_CmdBuf.Buf); + DS_SetFilterParmsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_PARMS_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterParms_Test_InvalidFilterParametersIndex(void) +void DS_SetFilterParmsCmd_Test_InvalidFilterParametersIndex(void) { - size_t forced_Size = sizeof(DS_FilterParmsCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_PARMS_CC; - DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER PARMS command arg: filter parameters index = %%d"); + DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; CmdPayload->MessageID = DS_UT_MID_1; CmdPayload->FilterParmsIndex = DS_FILTERS_PER_PACKET; /* Execute the function being tested */ - DS_CmdSetFilterParms(&UT_CmdBuf.Buf); + DS_SetFilterParmsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_PARMS_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterParms_Test_InvalidFilterAlgorithm(void) +void DS_SetFilterParmsCmd_Test_InvalidFilterAlgorithm(void) { - DS_HashLink_t HashLink; - - size_t forced_Size = sizeof(DS_FilterParmsCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_PARMS_CC; - DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER PARMS command arg: N = %%d, X = %%d, O = %%d"); + DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; CmdPayload->FilterParmsIndex = 2; CmdPayload->MessageID = DS_UT_MID_1; @@ -1081,43 +478,22 @@ void DS_CmdSetFilterParms_Test_InvalidFilterAlgorithm(void) CmdPayload->Algorithm_X = 1; CmdPayload->Algorithm_O = 1; - DS_AppData.HashTable[187] = &HashLink; - HashLink.Index = 0; DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; /* Execute the function being tested */ - DS_CmdSetFilterParms(&UT_CmdBuf.Buf); + DS_SetFilterParmsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_PARMS_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - 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_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); } -void DS_CmdSetFilterParms_Test_FilterTableNotLoaded(void) +void DS_SetFilterParmsCmd_Test_FilterTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_FilterParmsCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_PARMS_CC; - DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER PARMS command: packet filter table is not loaded"); + DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; CmdPayload->MessageID = DS_UT_MID_1; CmdPayload->FilterParmsIndex = 1; @@ -1128,84 +504,42 @@ void DS_CmdSetFilterParms_Test_FilterTableNotLoaded(void) DS_AppData.FilterTblPtr = NULL; /* Execute the function being tested */ - DS_CmdSetFilterParms(&UT_CmdBuf.Buf); + DS_SetFilterParmsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_PARMS_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetFilterParms_Test_MessageIDNotInFilterTable(void) +void DS_SetFilterParmsCmd_Test_MessageIDNotInFilterTable(void) { - DS_HashLink_t HashLink; - - size_t forced_Size = sizeof(DS_FilterParmsCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_FILTER_PARMS_CC; - DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid FILTER PARMS command: Message ID 0x%%08lX is not in filter table"); + DS_FilterParms_Payload_t *CmdPayload = &UT_CmdBuf.FilterParmsCmd.Payload; CmdPayload->FilterParmsIndex = 2; CmdPayload->MessageID = DS_UT_MID_2; - DS_AppData.HashTable[187] = &HashLink; - HashLink.Index = 0; DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyParms), true); UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), DS_INDEX_NONE); /* Execute the function being tested */ - DS_CmdSetFilterParms(&UT_CmdBuf.Buf); + DS_SetFilterParmsCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_PARMS_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestType_Test_Nominal(void) +void DS_SetDestTypeCmd_Test_Nominal(void) { - size_t forced_Size = sizeof(DS_DestTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_TYPE_CC; - DS_DestType_Payload_t *CmdPayload = &UT_CmdBuf.DestTypeCmd.Payload; - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "DEST TYPE command: file table index = %%d, filename type = %%d"); + DS_DestType_Payload_t *CmdPayload = &UT_CmdBuf.DestTypeCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->FileNameType = 2; @@ -1214,113 +548,41 @@ void DS_CmdSetDestType_Test_Nominal(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyType), true); /* Execute the function being tested */ - DS_CmdSetDestType(&UT_CmdBuf.Buf); + DS_SetDestTypeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); - - UtAssert_True(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].FileNameType == 2, - "DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].FileNameType == 2"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].FileNameType, 2); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_NTYPE_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_DestTypeCmd_t), "DS_DestTypeCmd_t is 32-bit aligned"); } -void DS_CmdSetDestType_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_DestTypeCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_TYPE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST TYPE command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdSetDestType(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_NTYPE_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdSetDestType_Test_InvalidFileTableIndex(void) +void DS_SetDestTypeCmd_Test_InvalidFileTableIndex(void) { - size_t forced_Size = sizeof(DS_DestTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_TYPE_CC; - DS_DestType_Payload_t *CmdPayload = &UT_CmdBuf.DestTypeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST TYPE command arg: file table index = %%d"); + DS_DestType_Payload_t *CmdPayload = &UT_CmdBuf.DestTypeCmd.Payload; CmdPayload->FileTableIndex = 99; /* Execute the function being tested */ - DS_CmdSetDestType(&UT_CmdBuf.Buf); + DS_SetDestTypeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_NTYPE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestType_Test_InvalidFilenameType(void) +void DS_SetDestTypeCmd_Test_InvalidFilenameType(void) { - size_t forced_Size = sizeof(DS_DestTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_TYPE_CC; - DS_DestType_Payload_t *CmdPayload = &UT_CmdBuf.DestTypeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST TYPE command arg: filename type = %%d"); + DS_DestType_Payload_t *CmdPayload = &UT_CmdBuf.DestTypeCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->FileNameType = 99; @@ -1328,38 +590,19 @@ void DS_CmdSetDestType_Test_InvalidFilenameType(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdSetDestType(&UT_CmdBuf.Buf); + DS_SetDestTypeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_NTYPE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestType_Test_FileTableNotLoaded(void) +void DS_SetDestTypeCmd_Test_FileTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_DestTypeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_TYPE_CC; - DS_DestType_Payload_t *CmdPayload = &UT_CmdBuf.DestTypeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST TYPE command: destination file table is not loaded"); + DS_DestType_Payload_t *CmdPayload = &UT_CmdBuf.DestTypeCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->FileNameType = 2; @@ -1370,38 +613,19 @@ void DS_CmdSetDestType_Test_FileTableNotLoaded(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyType), true); /* Execute the function being tested */ - DS_CmdSetDestType(&UT_CmdBuf.Buf); + DS_SetDestTypeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_NTYPE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestState_Test_Nominal(void) +void DS_SetDestStateCmd_Test_Nominal(void) { - size_t forced_Size = sizeof(DS_DestStateCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_STATE_CC; - DS_DestState_Payload_t *CmdPayload = &UT_CmdBuf.DestStateCmd.Payload; - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "DEST STATE command: file table index = %%d, file state = %%d"); + DS_DestState_Payload_t *CmdPayload = &UT_CmdBuf.DestStateCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->EnableState = 1; @@ -1410,114 +634,43 @@ void DS_CmdSetDestState_Test_Nominal(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyState), true); /* Execute the function being tested */ - DS_CmdSetDestState(&UT_CmdBuf.Buf); + DS_SetDestStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); UtAssert_True(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].EnableState == CmdPayload->EnableState, "DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].EnableState == " "CmdPayload->EnableState"); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_STATE_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_DestStateCmd_t), "DS_DestStateCmd_t is 32-bit aligned"); } -void DS_CmdSetDestState_Test_InvalidCommandLength(void) +void DS_SetDestStateCmd_Test_InvalidFileTableIndex(void) { - size_t forced_Size = sizeof(DS_DestStateCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_STATE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST STATE command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdSetDestState(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_STATE_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdSetDestState_Test_InvalidFileTableIndex(void) -{ - size_t forced_Size = sizeof(DS_DestStateCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_STATE_CC; - DS_DestState_Payload_t *CmdPayload = &UT_CmdBuf.DestStateCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST STATE command arg: file table index = %%d"); + DS_DestState_Payload_t *CmdPayload = &UT_CmdBuf.DestStateCmd.Payload; CmdPayload->FileTableIndex = 99; /* Execute the function being tested */ - DS_CmdSetDestState(&UT_CmdBuf.Buf); + DS_SetDestStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_STATE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestState_Test_InvalidFileState(void) +void DS_SetDestStateCmd_Test_InvalidFileState(void) { - size_t forced_Size = sizeof(DS_DestStateCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_STATE_CC; - DS_DestState_Payload_t *CmdPayload = &UT_CmdBuf.DestStateCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST STATE command arg: file state = %%d"); + DS_DestState_Payload_t *CmdPayload = &UT_CmdBuf.DestStateCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->EnableState = 99; @@ -1525,38 +678,19 @@ void DS_CmdSetDestState_Test_InvalidFileState(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdSetDestState(&UT_CmdBuf.Buf); + DS_SetDestStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_STATE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestState_Test_FileTableNotLoaded(void) +void DS_SetDestStateCmd_Test_FileTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_DestStateCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_STATE_CC; - DS_DestState_Payload_t *CmdPayload = &UT_CmdBuf.DestStateCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST STATE command: destination file table is not loaded"); + DS_DestState_Payload_t *CmdPayload = &UT_CmdBuf.DestStateCmd.Payload; CmdPayload->FileTableIndex = 1; @@ -1566,38 +700,19 @@ void DS_CmdSetDestState_Test_FileTableNotLoaded(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyState), true); /* Execute the function being tested */ - DS_CmdSetDestState(&UT_CmdBuf.Buf); + DS_SetDestStateCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_STATE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestPath_Test_Nominal(void) +void DS_SetDestPathCmd_Test_Nominal(void) { - size_t forced_Size = sizeof(DS_DestPathCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_PATH_CC; - DS_DestPath_Payload_t *CmdPayload = &UT_CmdBuf.DestPathCmd.Payload; - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "DEST PATH command: file table index = %%d, pathname = '%%s'"); + DS_DestPath_Payload_t *CmdPayload = &UT_CmdBuf.DestPathCmd.Payload; CmdPayload->FileTableIndex = 1; strncpy(CmdPayload->Pathname, "pathname", sizeof(CmdPayload->Pathname) - 1); @@ -1605,115 +720,44 @@ void DS_CmdSetDestPath_Test_Nominal(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdSetDestPath(&UT_CmdBuf.Buf); + DS_SetDestPathCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); UtAssert_True(strncmp(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].Pathname, "pathname", sizeof(DS_AppData.DestFileTblPtr->File[0].Pathname)) == 0, "strncmp (DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].Pathname, " "'pathname', sizeof(DestFileTable.File[0].Pathname) - 1) == 0"); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_PATH_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_DestPathCmd_t), "DS_DestPathCmd_t is 32-bit aligned"); } -void DS_CmdSetDestPath_Test_InvalidCommandLength(void) +void DS_SetDestPathCmd_Test_InvalidFileTableIndex(void) { - size_t forced_Size = sizeof(DS_DestPathCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_PATH_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST PATH command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdSetDestPath(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_PATH_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdSetDestPath_Test_InvalidFileTableIndex(void) -{ - size_t forced_Size = sizeof(DS_DestPathCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_PATH_CC; - DS_DestPath_Payload_t *CmdPayload = &UT_CmdBuf.DestPathCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST PATH command arg: file table index = %%d"); + DS_DestPath_Payload_t *CmdPayload = &UT_CmdBuf.DestPathCmd.Payload; CmdPayload->FileTableIndex = 99; /* Execute the function being tested */ - DS_CmdSetDestPath(&UT_CmdBuf.Buf); + DS_SetDestPathCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_PATH_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestPath_Test_FileTableNotLoaded(void) +void DS_SetDestPathCmd_Test_FileTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_DestPathCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_PATH_CC; - DS_DestPath_Payload_t *CmdPayload = &UT_CmdBuf.DestPathCmd.Payload; - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST PATH command: destination file table is not loaded"); + DS_DestPath_Payload_t *CmdPayload = &UT_CmdBuf.DestPathCmd.Payload; CmdPayload->FileTableIndex = 1; strncpy(CmdPayload->Pathname, "pathname", sizeof(CmdPayload->Pathname) - 1); @@ -1723,38 +767,19 @@ void DS_CmdSetDestPath_Test_FileTableNotLoaded(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdSetDestPath(&UT_CmdBuf.Buf); + DS_SetDestPathCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_PATH_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestBase_Test_Nominal(void) +void DS_SetDestBaseCmd_Test_Nominal(void) { - size_t forced_Size = sizeof(DS_DestBaseCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_BASE_CC; - DS_DestBase_Payload_t *CmdPayload = &UT_CmdBuf.DestBaseCmd.Payload; - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "DEST BASE command: file table index = %%d, base filename = '%%s'"); + DS_DestBase_Payload_t *CmdPayload = &UT_CmdBuf.DestBaseCmd.Payload; CmdPayload->FileTableIndex = 1; strncpy(CmdPayload->Basename, "base", sizeof(CmdPayload->Basename) - 1); @@ -1762,115 +787,44 @@ void DS_CmdSetDestBase_Test_Nominal(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdSetDestBase(&UT_CmdBuf.Buf); + DS_SetDestBaseCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); UtAssert_True(strncmp(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].Basename, "base", sizeof(DS_AppData.DestFileTblPtr->File[0].Basename)) == 0, "strncmp (DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].Basename, 'base', " "sizeof(DestFileTable.File[0].Basename)) == 0"); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_BASE_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_DestBaseCmd_t), "DS_DestBaseCmd_t is 32-bit aligned"); } -void DS_CmdSetDestBase_Test_InvalidCommandLength(void) +void DS_SetDestBaseCmd_Test_InvalidFileTableIndex(void) { - size_t forced_Size = sizeof(DS_DestBaseCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_BASE_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST BASE command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdSetDestBase(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_BASE_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdSetDestBase_Test_InvalidFileTableIndex(void) -{ - size_t forced_Size = sizeof(DS_DestBaseCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_BASE_CC; - DS_DestBase_Payload_t *CmdPayload = &UT_CmdBuf.DestBaseCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST BASE command arg: file table index = %%d"); + DS_DestBase_Payload_t *CmdPayload = &UT_CmdBuf.DestBaseCmd.Payload; CmdPayload->FileTableIndex = 99; /* Execute the function being tested */ - DS_CmdSetDestBase(&UT_CmdBuf.Buf); + DS_SetDestBaseCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_BASE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestBase_Test_FileTableNotLoaded(void) +void DS_SetDestBaseCmd_Test_FileTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_DestBaseCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_BASE_CC; - DS_DestBase_Payload_t *CmdPayload = &UT_CmdBuf.DestBaseCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST BASE command: destination file table is not loaded"); + DS_DestBase_Payload_t *CmdPayload = &UT_CmdBuf.DestBaseCmd.Payload; CmdPayload->FileTableIndex = 1; strncpy(CmdPayload->Basename, "base", sizeof(CmdPayload->Basename)); @@ -1880,38 +834,19 @@ void DS_CmdSetDestBase_Test_FileTableNotLoaded(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdSetDestBase(&UT_CmdBuf.Buf); + DS_SetDestBaseCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_BASE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestExt_Test_Nominal(void) +void DS_SetDestExtCmd_Test_Nominal(void) { - size_t forced_Size = sizeof(DS_DestExtCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_EXT_CC; - DS_DestExt_Payload_t *CmdPayload = &UT_CmdBuf.DestExtCmd.Payload; - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "DEST EXT command: file table index = %%d, extension = '%%s'"); + DS_DestExt_Payload_t *CmdPayload = &UT_CmdBuf.DestExtCmd.Payload; CmdPayload->FileTableIndex = 1; strncpy(CmdPayload->Extension, "txt", DS_EXTENSION_BUFSIZE); @@ -1919,10 +854,10 @@ void DS_CmdSetDestExt_Test_Nominal(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdSetDestExt(&UT_CmdBuf.Buf); + DS_SetDestExtCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); UtAssert_True(strncmp(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].Extension, "txt", DS_EXTENSION_BUFSIZE) == 0, @@ -1930,105 +865,34 @@ void DS_CmdSetDestExt_Test_Nominal(void) "DS_EXTENSION_BUFSIZE) == " "0"); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_EXT_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_DestExtCmd_t), "DS_DestExtCmd_t is 32-bit aligned"); } -void DS_CmdSetDestExt_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_DestExtCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_EXT_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST EXT command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdSetDestExt(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_EXT_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdSetDestExt_Test_InvalidFileTableIndex(void) +void DS_SetDestExtCmd_Test_InvalidFileTableIndex(void) { - size_t forced_Size = sizeof(DS_DestExtCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_EXT_CC; - DS_DestExt_Payload_t *CmdPayload = &UT_CmdBuf.DestExtCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST EXT command arg: file table index = %%d"); + DS_DestExt_Payload_t *CmdPayload = &UT_CmdBuf.DestExtCmd.Payload; CmdPayload->FileTableIndex = 99; /* Execute the function being tested */ - DS_CmdSetDestExt(&UT_CmdBuf.Buf); + DS_SetDestExtCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_EXT_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestExt_Test_FileTableNotLoaded(void) +void DS_SetDestExtCmd_Test_FileTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_DestExtCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_EXT_CC; - DS_DestExt_Payload_t *CmdPayload = &UT_CmdBuf.DestExtCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST EXT command: destination file table is not loaded"); + DS_DestExt_Payload_t *CmdPayload = &UT_CmdBuf.DestExtCmd.Payload; CmdPayload->FileTableIndex = 1; strncpy(CmdPayload->Extension, "txt", DS_EXTENSION_BUFSIZE); @@ -2038,38 +902,19 @@ void DS_CmdSetDestExt_Test_FileTableNotLoaded(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdSetDestExt(&UT_CmdBuf.Buf); + DS_SetDestExtCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_EXT_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestSize_Test_Nominal(void) +void DS_SetDestSizeCmd_Test_Nominal(void) { - size_t forced_Size = sizeof(DS_DestSizeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_SIZE_CC; - DS_DestSize_Payload_t *CmdPayload = &UT_CmdBuf.DestSizeCmd.Payload; - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "DEST SIZE command: file table index = %%d, size limit = %%d"); + DS_DestSize_Payload_t *CmdPayload = &UT_CmdBuf.DestSizeCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->MaxFileSize = 100000000; @@ -2078,118 +923,42 @@ void DS_CmdSetDestSize_Test_Nominal(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifySize), true); /* Execute the function being tested */ - DS_CmdSetDestSize(&UT_CmdBuf.Buf); + DS_SetDestSizeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); - - UtAssert_True(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].MaxFileSize == 100000000, - "DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].MaxFileSize == 100000000"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].MaxFileSize, 100000000); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_SIZE_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_DestSizeCmd_t), "DS_DestSizeCmd_t is 32-bit aligned"); } -void DS_CmdSetDestSize_Test_InvalidCommandLength(void) +void DS_SetDestSizeCmd_Test_InvalidFileTableIndex(void) { - size_t forced_Size = sizeof(DS_DestSizeCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_SIZE_CC; - DS_DestSize_Payload_t *CmdPayload = &UT_CmdBuf.DestSizeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST SIZE command length: expected = %%d, actual = %%d"); - - CmdPayload->FileTableIndex = 1; - CmdPayload->MaxFileSize = 100000000; - - /* Execute the function being tested */ - DS_CmdSetDestSize(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_SIZE_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdSetDestSize_Test_InvalidFileTableIndex(void) -{ - size_t forced_Size = sizeof(DS_DestSizeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_SIZE_CC; - DS_DestSize_Payload_t *CmdPayload = &UT_CmdBuf.DestSizeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST SIZE command arg: file table index = %%d"); + DS_DestSize_Payload_t *CmdPayload = &UT_CmdBuf.DestSizeCmd.Payload; CmdPayload->FileTableIndex = 99; CmdPayload->MaxFileSize = 100000000; /* Execute the function being tested */ - DS_CmdSetDestSize(&UT_CmdBuf.Buf); + DS_SetDestSizeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_SIZE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestSize_Test_InvalidFileSizeLimit(void) +void DS_SetDestSizeCmd_Test_InvalidFileSizeLimit(void) { - size_t forced_Size = sizeof(DS_DestSizeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_SIZE_CC; - DS_DestSize_Payload_t *CmdPayload = &UT_CmdBuf.DestSizeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST SIZE command arg: size limit = %%d"); + DS_DestSize_Payload_t *CmdPayload = &UT_CmdBuf.DestSizeCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->MaxFileSize = 1; @@ -2199,38 +968,19 @@ void DS_CmdSetDestSize_Test_InvalidFileSizeLimit(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdSetDestSize(&UT_CmdBuf.Buf); + DS_SetDestSizeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_SIZE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestSize_Test_FileTableNotLoaded(void) +void DS_SetDestSizeCmd_Test_FileTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_DestSizeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_SIZE_CC; - DS_DestSize_Payload_t *CmdPayload = &UT_CmdBuf.DestSizeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST SIZE command: destination file table is not loaded"); + DS_DestSize_Payload_t *CmdPayload = &UT_CmdBuf.DestSizeCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->MaxFileSize = 100000000; @@ -2241,38 +991,19 @@ void DS_CmdSetDestSize_Test_FileTableNotLoaded(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifySize), true); /* Execute the function being tested */ - DS_CmdSetDestSize(&UT_CmdBuf.Buf); + DS_SetDestSizeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_SIZE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestAge_Test_Nominal(void) +void DS_SetDestAgeCmd_Test_Nominal(void) { - size_t forced_Size = sizeof(DS_DestAgeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_AGE_CC; - DS_DestAge_Payload_t *CmdPayload = &UT_CmdBuf.DestAgeCmd.Payload; - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "DEST AGE command: file table index = %%d, age limit = %%d"); + DS_DestAge_Payload_t *CmdPayload = &UT_CmdBuf.DestAgeCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->MaxFileAge = 1000; @@ -2281,117 +1012,42 @@ void DS_CmdSetDestAge_Test_Nominal(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyAge), true); /* Execute the function being tested */ - DS_CmdSetDestAge(&UT_CmdBuf.Buf); + DS_SetDestAgeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); - - UtAssert_True(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].MaxFileAge == 1000, - "DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].MaxFileAge == 1000"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].MaxFileAge, 1000); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_AGE_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_DestAgeCmd_t), "DS_DestAgeCmd_t is 32-bit aligned"); } -void DS_CmdSetDestAge_Test_InvalidCommandLength(void) +void DS_SetDestAgeCmd_Test_InvalidFileTableIndex(void) { - size_t forced_Size = sizeof(DS_DestAgeCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_AGE_CC; - DS_DestAge_Payload_t *CmdPayload = &UT_CmdBuf.DestAgeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST AGE command length: expected = %%d, actual = %%d"); - - CmdPayload->FileTableIndex = 1; - CmdPayload->MaxFileAge = 1000; - - /* Execute the function being tested */ - DS_CmdSetDestAge(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_AGE_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdSetDestAge_Test_InvalidFileTableIndex(void) -{ - size_t forced_Size = sizeof(DS_DestAgeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_AGE_CC; - DS_DestAge_Payload_t *CmdPayload = &UT_CmdBuf.DestAgeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST AGE command arg: file table index = %%d"); + DS_DestAge_Payload_t *CmdPayload = &UT_CmdBuf.DestAgeCmd.Payload; CmdPayload->FileTableIndex = 99; CmdPayload->MaxFileAge = 1000; /* Execute the function being tested */ - DS_CmdSetDestAge(&UT_CmdBuf.Buf); + DS_SetDestAgeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_AGE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestAge_Test_InvalidFileAgeLimit(void) +void DS_SetDestAgeCmd_Test_InvalidFileAgeLimit(void) { - size_t forced_Size = sizeof(DS_DestAgeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_AGE_CC; - DS_DestAge_Payload_t *CmdPayload = &UT_CmdBuf.DestAgeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Invalid DEST AGE command arg: age limit = %%d"); + DS_DestAge_Payload_t *CmdPayload = &UT_CmdBuf.DestAgeCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->MaxFileAge = 1; @@ -2401,38 +1057,19 @@ void DS_CmdSetDestAge_Test_InvalidFileAgeLimit(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdSetDestAge(&UT_CmdBuf.Buf); + DS_SetDestAgeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_AGE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestAge_Test_FileTableNotLoaded(void) +void DS_SetDestAgeCmd_Test_FileTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_DestAgeCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_AGE_CC; - DS_DestAge_Payload_t *CmdPayload = &UT_CmdBuf.DestAgeCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST AGE command: destination file table is not loaded"); + DS_DestAge_Payload_t *CmdPayload = &UT_CmdBuf.DestAgeCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->MaxFileAge = 1000; @@ -2443,161 +1080,64 @@ void DS_CmdSetDestAge_Test_FileTableNotLoaded(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyAge), true); /* Execute the function being tested */ - DS_CmdSetDestAge(&UT_CmdBuf.Buf); + DS_SetDestAgeCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_AGE_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdSetDestCount_Test_Nominal(void) -{ - size_t forced_Size = sizeof(DS_DestCountCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_COUNT_CC; - DS_DestCount_Payload_t *CmdPayload = &UT_CmdBuf.DestCountCmd.Payload; - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "DEST COUNT command: file table index = %%d, sequence count = %%d"); - - CmdPayload->FileTableIndex = 1; - CmdPayload->SequenceCount = 1; - - UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); - UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyCount), true); - - /* Execute the function being tested */ - DS_CmdSetDestCount(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); - - UtAssert_True(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].SequenceCount == 1, - "DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].SequenceCount == 1"); - - UtAssert_True(DS_AppData.FileStatus[CmdPayload->FileTableIndex].FileCount == 1, - "DS_AppData.FileStatus[CmdPayload->FileTableIndex].FileCount == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_SEQ_CMD_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ - UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_DestCountCmd_t), "DS_DestCountCmd_t is 32-bit aligned"); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_AGE_CMD_ERR_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); } -void DS_CmdSetDestCount_Test_InvalidCommandLength(void) +void DS_SetDestCountCmd_Test_Nominal(void) { - size_t forced_Size = sizeof(DS_DestCountCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_COUNT_CC; - DS_DestCount_Payload_t *CmdPayload = &UT_CmdBuf.DestCountCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST COUNT command length: expected = %%d, actual = %%d"); + DS_DestCount_Payload_t *CmdPayload = &UT_CmdBuf.DestCountCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->SequenceCount = 1; + UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); + UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyCount), true); + /* Execute the function being tested */ - DS_CmdSetDestCount(&UT_CmdBuf.Buf); + DS_SetDestCountCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_SEQ_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); + UtAssert_UINT32_EQ(DS_AppData.DestFileTblPtr->File[CmdPayload->FileTableIndex].SequenceCount, 1); + UtAssert_UINT32_EQ(DS_AppData.FileStatus[CmdPayload->FileTableIndex].FileCount, 1); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_SEQ_CMD_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); + /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ + UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_DestCountCmd_t), "DS_DestCountCmd_t is 32-bit aligned"); } -void DS_CmdSetDestCount_Test_InvalidFileTableIndex(void) +void DS_SetDestCountCmd_Test_InvalidFileTableIndex(void) { - size_t forced_Size = sizeof(DS_DestCountCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_COUNT_CC; - DS_DestCount_Payload_t *CmdPayload = &UT_CmdBuf.DestCountCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST COUNT command arg: file table index = %%d"); + DS_DestCount_Payload_t *CmdPayload = &UT_CmdBuf.DestCountCmd.Payload; CmdPayload->FileTableIndex = 99; CmdPayload->SequenceCount = 1; /* Execute the function being tested */ - DS_CmdSetDestCount(&UT_CmdBuf.Buf); + DS_SetDestCountCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_SEQ_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestCount_Test_InvalidFileSequenceCount(void) +void DS_SetDestCountCmd_Test_InvalidFileSequenceCount(void) { - size_t forced_Size = sizeof(DS_DestCountCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_COUNT_CC; - DS_DestCount_Payload_t *CmdPayload = &UT_CmdBuf.DestCountCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST COUNT command arg: sequence count = %%d"); + DS_DestCount_Payload_t *CmdPayload = &UT_CmdBuf.DestCountCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->SequenceCount = -1; @@ -2607,38 +1147,19 @@ void DS_CmdSetDestCount_Test_InvalidFileSequenceCount(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdSetDestCount(&UT_CmdBuf.Buf); + DS_SetDestCountCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_SEQ_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdSetDestCount_Test_FileTableNotLoaded(void) +void DS_SetDestCountCmd_Test_FileTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_DestCountCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_SET_DEST_COUNT_CC; - DS_DestCount_Payload_t *CmdPayload = &UT_CmdBuf.DestCountCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST COUNT command: destination file table is not loaded"); + DS_DestCount_Payload_t *CmdPayload = &UT_CmdBuf.DestCountCmd.Payload; CmdPayload->FileTableIndex = 1; CmdPayload->SequenceCount = 1; @@ -2649,41 +1170,20 @@ void DS_CmdSetDestCount_Test_FileTableNotLoaded(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyCount), true); /* Execute the function being tested */ - DS_CmdSetDestCount(&UT_CmdBuf.Buf); + DS_SetDestCountCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_SEQ_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdCloseFile_Test_Nominal(void) +void DS_CloseFileCmd_Test_Nominal(void) { - uint32 i; - uint8 call_count_DS_FileUpdateHeader = 0; - uint8 call_count_DS_FileCloseDest = 0; - - size_t forced_Size = sizeof(DS_CloseFileCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_CLOSE_FILE_CC; - DS_CloseFile_Payload_t *CmdPayload = &UT_CmdBuf.CloseFileCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "DEST CLOSE command: file table index = %%d"); + uint32 i; + DS_CloseFile_Payload_t *CmdPayload = &UT_CmdBuf.CloseFileCmd.Payload; UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); @@ -2699,50 +1199,26 @@ void DS_CmdCloseFile_Test_Nominal(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdCloseFile(&UT_CmdBuf.Buf); + DS_CloseFileCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_CLOSE_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_DS_FileUpdateHeader = UT_GetStubCount(UT_KEY(DS_FileUpdateHeader)); - UtAssert_INT32_EQ(call_count_DS_FileUpdateHeader, 1); - - call_count_DS_FileCloseDest = UT_GetStubCount(UT_KEY(DS_FileCloseDest)); - UtAssert_INT32_EQ(call_count_DS_FileCloseDest, 1); + UtAssert_STUB_COUNT(DS_FileUpdateHeader, 1); + UtAssert_STUB_COUNT(DS_FileCloseDest, 1); /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_CloseFileCmd_t), "DS_CloseFileCmd_t is 32-bit aligned"); } -void DS_CmdCloseFile_Test_NominalAlreadyClosed(void) +void DS_CloseFileCmd_Test_NominalAlreadyClosed(void) { - uint32 i; - uint8 call_count_DS_FileUpdateHeader = 0; - uint8 call_count_DS_FileCloseDest = 0; - - size_t forced_Size = sizeof(DS_CloseFileCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_CLOSE_FILE_CC; - DS_CloseFile_Payload_t *CmdPayload = &UT_CmdBuf.CloseFileCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "DEST CLOSE command: file table index = %%d"); + uint32 i; + DS_CloseFile_Payload_t *CmdPayload = &UT_CmdBuf.CloseFileCmd.Payload; UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); @@ -2756,122 +1232,45 @@ void DS_CmdCloseFile_Test_NominalAlreadyClosed(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), true); /* Execute the function being tested */ - DS_CmdCloseFile(&UT_CmdBuf.Buf); + DS_CloseFileCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_CLOSE_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_DS_FileUpdateHeader = UT_GetStubCount(UT_KEY(DS_FileUpdateHeader)); - UtAssert_INT32_EQ(call_count_DS_FileUpdateHeader, 0); - - call_count_DS_FileCloseDest = UT_GetStubCount(UT_KEY(DS_FileCloseDest)); - UtAssert_INT32_EQ(call_count_DS_FileCloseDest, 0); + UtAssert_STUB_COUNT(DS_FileUpdateHeader, 0); + UtAssert_STUB_COUNT(DS_FileCloseDest, 0); /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_CloseFileCmd_t), "DS_CloseFileCmd_t is 32-bit aligned"); } -void DS_CmdCloseFile_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_CloseFileCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_CLOSE_FILE_CC; - DS_CloseFile_Payload_t *CmdPayload = &UT_CmdBuf.CloseFileCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST CLOSE command length: expected = %%d, actual = %%d"); - - CmdPayload->FileTableIndex = 0; - - /* Execute the function being tested */ - DS_CmdCloseFile(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_CLOSE_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdCloseFile_Test_InvalidFileTableIndex(void) +void DS_CloseFileCmd_Test_InvalidFileTableIndex(void) { - size_t forced_Size = sizeof(DS_CloseFileCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_CLOSE_FILE_CC; - DS_CloseFile_Payload_t *CmdPayload = &UT_CmdBuf.CloseFileCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); + DS_CloseFile_Payload_t *CmdPayload = &UT_CmdBuf.CloseFileCmd.Payload; UT_SetDefaultReturnValue(UT_KEY(DS_TableVerifyFileIndex), false); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST CLOSE command arg: file table index = %%d"); - CmdPayload->FileTableIndex = 99; /* Execute the function being tested */ - DS_CmdCloseFile(&UT_CmdBuf.Buf); + DS_CloseFileCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_CLOSE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdCloseAll_Test_Nominal(void) +void DS_CloseAllCmd_Test_Nominal(void) { uint32 i; - size_t forced_Size = sizeof(DS_CloseAllCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_CLOSE_ALL_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "DEST CLOSE ALL command"); - for (i = 1; i < DS_DEST_FILE_CNT; i++) { DS_AppData.FileStatus[i].FileHandle = OS_OBJECT_ID_UNDEFINED; @@ -2882,32 +1281,22 @@ void DS_CmdCloseAll_Test_Nominal(void) #endif /* Execute the function being tested */ - DS_CmdCloseAll(&UT_CmdBuf.Buf); + DS_CloseAllCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_CLOSE_ALL_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_CloseAllCmd_t), "DS_CloseAllCmd_t is 32-bit aligned"); } -void DS_CmdCloseAll_Test_CloseAll(void) +void DS_CloseAllCmd_Test_CloseAll(void) { uint32 i; - size_t forced_Size = sizeof(DS_CloseAllCmd_t); - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); for (i = 0; i < DS_DEST_FILE_CNT; i++) { @@ -2915,7 +1304,7 @@ void DS_CmdCloseAll_Test_CloseAll(void) } /* Execute the function being tested */ - UtAssert_VOIDCALL(DS_CmdCloseAll(&UT_CmdBuf.Buf)); + UtAssert_VOIDCALL(DS_CloseAllCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(DS_AppData.CmdAcceptedCounter, 1); @@ -2929,55 +1318,10 @@ void DS_CmdCloseAll_Test_CloseAll(void) UtAssert_BOOL_TRUE(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_CloseAllCmd_t)); } -void DS_CmdCloseAll_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_CloseAllCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_CLOSE_ALL_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid DEST CLOSE ALL command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdCloseAll(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_CLOSE_ALL_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdGetFileInfo_Test_EnabledOpen(void) +void DS_GetFileInfoCmd_Test_EnabledOpen(void) { uint32 i; - size_t forced_Size = sizeof(DS_GetFileInfoCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_GET_FILE_INFO_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "GET FILE INFO command"); - for (i = 0; i < DS_DEST_FILE_CNT; i++) { DS_AppData.FileStatus[i].FileAge = 1; @@ -2990,42 +1334,24 @@ void DS_CmdGetFileInfo_Test_EnabledOpen(void) } /* Execute the function being tested */ - DS_CmdGetFileInfo(&UT_CmdBuf.Buf); + DS_GetFileInfoCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); /* Changes to DS_FileInfoPkt cannot easily be verified because DS_FileInfoPkt is a local variable */ - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_GET_FILE_INFO_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(TLM_STRUCT_DATA_IS_32_ALIGNED(DS_FileInfoPkt_t), "DS_FileInfoPkt_t is 32-bit aligned"); } -void DS_CmdGetFileInfo_Test_DisabledClosed(void) +void DS_GetFileInfoCmd_Test_DisabledClosed(void) { uint32 i; - size_t forced_Size = sizeof(DS_GetFileInfoCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_GET_FILE_INFO_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "GET FILE INFO command"); - for (i = 0; i < DS_DEST_FILE_CNT; i++) { DS_AppData.FileStatus[i].FileAge = 1; @@ -3041,90 +1367,30 @@ void DS_CmdGetFileInfo_Test_DisabledClosed(void) DS_AppData.DestFileTblPtr = NULL; /* Execute the function being tested */ - DS_CmdGetFileInfo(&UT_CmdBuf.Buf); + DS_GetFileInfoCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_GET_FILE_INFO_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - 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_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); /* Generates 1 event message we don't care about in this test */ } -void DS_CmdGetFileInfo_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_GetFileInfoCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_GET_FILE_INFO_CC; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid GET FILE INFO command length: expected = %%d, actual = %%d"); - - /* Execute the function being tested */ - DS_CmdGetFileInfo(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_GET_FILE_INFO_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdAddMID_Test_Nominal(void) +void DS_AddMIDCmd_Test_Nominal(void) { - int32 FilterTableIndex; - DS_HashLink_t HashLink; - - size_t forced_Size = sizeof(DS_AddMidCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_ADD_MID_CC; - DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.AddMidCmd.Payload; + int32 FilterTableIndex; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ADD MID command: MID = 0x%%08lX, filter index = %%d, hash index = %%d"); + DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.AddMidCmd.Payload; /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_AddMidCmd_t), "DS_AddMidCmd_t is 32-bit aligned"); CmdPayload->MessageID = DS_UT_MID_1; - DS_AppData.HashTable[0] = &HashLink; - HashLink.Index = 0; - DS_AppData.FilterTblPtr->Packet[HashLink.Index].MessageID = CFE_SB_INVALID_MSG_ID; - HashLink.Next = (struct DS_HashTag *)&DS_AppData.HashTable[1]; - - DS_AppData.HashTable[1] = &HashLink; - HashLink.Index = 1; - HashLink.Next = (struct DS_HashTag *)&DS_AppData.HashTable[2]; - - DS_AppData.FilterTblPtr->Packet[HashLink.Index].MessageID = DS_UT_MID_2; + DS_AppData.FilterTblPtr->Packet[0].MessageID = CFE_SB_INVALID_MSG_ID; + DS_AppData.FilterTblPtr->Packet[1].MessageID = DS_UT_MID_2; FilterTableIndex = 0; @@ -3135,164 +1401,61 @@ void DS_CmdAddMID_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(DS_TableFindMsgID), 1, 0); /* Execute the function being tested */ - DS_CmdAddMID(&UT_CmdBuf.Buf); + DS_AddMIDCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdAcceptedCounter == 1, "DS_AppData.CmdAcceptedCounter == 1"); + UtAssert_UINT32_EQ(DS_AppData.CmdAcceptedCounter, 1); UtAssert_BOOL_TRUE(CFE_SB_MsgId_Equal(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].MessageID, DS_UT_MID_1)); /* Check first elements */ - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FileTableIndex == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FileTableIndex == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FilterType == DS_BY_COUNT, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FilterType == DS_BY_COUNT"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_N == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_N == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_X == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_X == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_O == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_O == 0"); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FileTableIndex); + UtAssert_UINT8_EQ(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FilterType, DS_BY_COUNT); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_N); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_X); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_O); /* Check middle elements */ - UtAssert_True( - DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].FileTableIndex == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET/2].FileTableIndex == 0"); - - UtAssert_True( - DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].FilterType == DS_BY_COUNT, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET/2].FilterType == DS_BY_COUNT"); - - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_N == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET/2].Algorithm_N == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_X == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET/2].Algorithm_X == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_O == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET/2].Algorithm_O == 0"); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].FileTableIndex); + UtAssert_UINT8_EQ(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].FilterType, + DS_BY_COUNT); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_N); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_X); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_O); /* Check last elements */ - UtAssert_True( - DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].FileTableIndex == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET-1].FileTableIndex == 0"); - - UtAssert_True( - DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].FilterType == DS_BY_COUNT, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET-1].FilterType == DS_BY_COUNT"); - - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_N == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET-1].Algorithm_N == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_X == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET-1].Algorithm_X == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_O == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET-1].Algorithm_O == 0"); - - /* UtAssert_True (DS_AppData.HashLinks[0].Index == 0, "DS_AppData.HashLinks[0].Index == 0"); */ - /* UtAssert_True (DS_AppData.HashLinks[0].MessageID == DS_UT_MID_1, "DS_AppData.HashLinks[0].MessageID == - * DS_UT_MID_1"); */ - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].FileTableIndex); + UtAssert_UINT8_EQ(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].FilterType, + DS_BY_COUNT); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_N); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_X); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_O); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_ADD_MID_CMD_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdAddMID_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_AddMidCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_ADD_MID_CC; - DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.AddMidCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid ADD MID command length: expected = %%d, actual = %%d"); - - CmdPayload->MessageID = DS_UT_MID_1; - - /* Execute the function being tested */ - DS_CmdAddMID(&UT_CmdBuf.Buf); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_ADD_MID_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdAddMID_Test_InvalidMessageID(void) +void DS_AddMIDCmd_Test_InvalidMessageID(void) { - size_t forced_Size = sizeof(DS_AddMidCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_ADD_MID_CC; - DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.AddMidCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid ADD MID command arg: invalid MID = 0x%%08lX"); + DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.AddMidCmd.Payload; CmdPayload->MessageID = CFE_SB_INVALID_MSG_ID; /* Execute the function being tested */ - DS_CmdAddMID(&UT_CmdBuf.Buf); + DS_AddMIDCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - /* UtAssert_True - (Ut_CFE_EVS_EventSent(DS_ADD_MID_CMD_ERR_EID, CFE_EVS_ERROR, "Invalid ADD MID command arg: invalid MID = 0x - 0"), "Invalid ADD MID command arg: invalid MID = 0x 0"); - */ - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_ADD_MID_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdAddMID_Test_FilterTableNotLoaded(void) +void DS_AddMIDCmd_Test_FilterTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_AddMidCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_ADD_MID_CC; - DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.AddMidCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid ADD MID command: filter table is not loaded"); + DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.AddMidCmd.Payload; CmdPayload->MessageID = DS_UT_MID_1; @@ -3300,81 +1463,39 @@ void DS_CmdAddMID_Test_FilterTableNotLoaded(void) DS_AppData.FilterTblPtr = NULL; /* Execute the function being tested */ - DS_CmdAddMID(&UT_CmdBuf.Buf); + DS_AddMIDCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_ADD_MID_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdAddMID_Test_MIDAlreadyInFilterTable(void) +void DS_AddMIDCmd_Test_MIDAlreadyInFilterTable(void) { - DS_HashLink_t HashLink; - - size_t forced_Size = sizeof(DS_AddMidCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_ADD_MID_CC; - DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.AddMidCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid ADD MID command: MID = 0x%%08lX is already in filter table at index = %%d"); + DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.AddMidCmd.Payload; - CmdPayload->MessageID = DS_UT_MID_1; - - DS_AppData.HashTable[187] = &HashLink; - HashLink.Index = 0; + CmdPayload->MessageID = DS_UT_MID_1; DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; UT_SetDeferredRetcode(UT_KEY(DS_TableFindMsgID), 1, 1); /* Execute the function being tested */ - DS_CmdAddMID(&UT_CmdBuf.Buf); + DS_AddMIDCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_ADD_MID_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdAddMID_Test_FilterTableFull(void) +void DS_AddMIDCmd_Test_FilterTableFull(void) { - size_t forced_Size = sizeof(DS_AddMidCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_ADD_MID_CC; - DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.AddMidCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Invalid ADD MID command: filter table is full"); + DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.AddMidCmd.Payload; CmdPayload->MessageID = DS_UT_MID_1; @@ -3382,208 +1503,91 @@ void DS_CmdAddMID_Test_FilterTableFull(void) UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), DS_INDEX_NONE); /* Execute the function being tested */ - DS_CmdAddMID(&UT_CmdBuf.Buf); + DS_AddMIDCmd(&UT_CmdBuf.Buf); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_ADD_MID_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdRemoveMID_Test_Nominal(void) +void DS_RemoveMIDCmd_Test_Nominal(void) { - DS_HashLink_t HashLink; - size_t forced_Size = sizeof(DS_RemoveMidCmd_t); CFE_SB_MsgId_t MessageID = DS_UT_MID_1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_REMOVE_MID_CC; int32 FilterTableIndex = 0; int32 HashTableIndex = 1; - int32 strCmpResult; - DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.RemoveMidCmd.Payload; - - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "REMOVE MID command: MID = 0x%%08lX, filter index = %%d, hash index = %%d"); + DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.RemoveMidCmd.Payload; /* Verify command struct size minus header is at least explicitly padded to 32-bit boundaries */ UtAssert_True(CMD_STRUCT_DATA_IS_32_ALIGNED(DS_RemoveMidCmd_t), "DS_RemoveMidCmd_t is 32-bit aligned"); - CmdPayload->MessageID = MessageID; - HashLink.Index = FilterTableIndex; - HashLink.MessageID = MessageID; - DS_AppData.HashTable[HashTableIndex] = &HashLink; - DS_AppData.FilterTblPtr->Packet[HashLink.Index].MessageID = MessageID; + CmdPayload->MessageID = MessageID; + DS_AppData.FilterTblPtr->Packet[FilterTableIndex].MessageID = MessageID; UT_SetDeferredRetcode(UT_KEY(DS_TableFindMsgID), 1, FilterTableIndex); /* Execute the function being tested */ - UtAssert_VOIDCALL(DS_CmdRemoveMID(&UT_CmdBuf.Buf)); + UtAssert_VOIDCALL(DS_RemoveMIDCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(CFE_SB_MsgIdToValue(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].MessageID), CFE_SB_MsgIdToValue(CFE_SB_INVALID_MSG_ID)); - UtAssert_INT32_EQ(DS_AppData.HashTable[HashTableIndex]->Index, 0); UtAssert_INT32_EQ(CFE_SB_MsgIdToValue(DS_AppData.HashLinks[HashTableIndex].MessageID), CFE_SB_MsgIdToValue(CFE_SB_INVALID_MSG_ID)); /* Check first elements */ - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FileTableIndex == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FileTableIndex == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FilterType == DS_BY_COUNT, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FilterType == DS_BY_COUNT"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_N == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_N == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_X == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_X == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_O == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_O == 0"); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FileTableIndex); + UtAssert_UINT8_EQ(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].FilterType, DS_BY_COUNT); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_N); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_X); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[0].Algorithm_O); /* Check middle elements */ - UtAssert_True( - DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].FileTableIndex == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET/2].FileTableIndex == 0"); - - UtAssert_True( - DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].FilterType == DS_BY_COUNT, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET/2].FilterType == DS_BY_COUNT"); - - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_N == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET/2].Algorithm_N == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_X == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET/2].Algorithm_X == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_O == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET/2].Algorithm_O == 0"); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].FileTableIndex); + UtAssert_UINT8_EQ(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].FilterType, + DS_BY_COUNT); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_N); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_X); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET / 2].Algorithm_O); /* Check last elements */ - UtAssert_True( - DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].FileTableIndex == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET-1].FileTableIndex == 0"); - - UtAssert_True( - DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].FilterType == DS_BY_COUNT, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET-1].FilterType == DS_BY_COUNT"); - - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_N == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET-1].Algorithm_N == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_X == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET-1].Algorithm_X == 0"); - UtAssert_True(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_O == 0, - "DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET-1].Algorithm_O == 0"); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].FileTableIndex); + UtAssert_UINT8_EQ(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].FilterType, + DS_BY_COUNT); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_N); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_X); + UtAssert_ZERO(DS_AppData.FilterTblPtr->Packet[FilterTableIndex].Filter[DS_FILTERS_PER_PACKET - 1].Algorithm_O); - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - UtAssert_STUB_COUNT(CFE_MSG_GetSize, 1); UtAssert_STUB_COUNT(CFE_SB_IsValidMsgId, 1); UtAssert_STUB_COUNT(DS_TableHashFunction, 1); UtAssert_STUB_COUNT(DS_TableCreateHash, 1); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_REMOVE_MID_CMD_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); } -void DS_CmdRemoveMID_Test_InvalidCommandLength(void) -{ - size_t forced_Size = sizeof(DS_RemoveMidCmd_t) + 1; - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_REMOVE_MID_CC; - DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.RemoveMidCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid REMOVE MID command length: expected = %%d, actual = %%d"); - - CmdPayload->MessageID = DS_UT_MID_1; - - /* Execute the function being tested */ - UtAssert_VOIDCALL(DS_CmdRemoveMID(&UT_CmdBuf.Buf)); - - /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_REMOVE_MID_CMD_ERR_EID); - - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); -} - -void DS_CmdRemoveMID_Test_InvalidMessageID(void) +void DS_RemoveMIDCmd_Test_InvalidMessageID(void) { - size_t forced_Size = sizeof(DS_RemoveMidCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_REMOVE_MID_CC; - DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.RemoveMidCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid REMOVE MID command arg: invalid MID = 0x%%08lX"); + DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.RemoveMidCmd.Payload; CmdPayload->MessageID = CFE_SB_INVALID_MSG_ID; /* Execute the function being tested */ - UtAssert_VOIDCALL(DS_CmdRemoveMID(&UT_CmdBuf.Buf)); + UtAssert_VOIDCALL(DS_RemoveMIDCmd(&UT_CmdBuf.Buf)); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_REMOVE_MID_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdRemoveMID_Test_FilterTableNotLoaded(void) +void DS_RemoveMIDCmd_Test_FilterTableNotLoaded(void) { - size_t forced_Size = sizeof(DS_RemoveMidCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_REMOVE_MID_CC; - DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.RemoveMidCmd.Payload; - - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); - - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid REMOVE MID command: filter table is not loaded"); + DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.RemoveMidCmd.Payload; CmdPayload->MessageID = DS_UT_MID_1; @@ -3591,230 +1595,167 @@ void DS_CmdRemoveMID_Test_FilterTableNotLoaded(void) DS_AppData.FilterTblPtr = NULL; /* Execute the function being tested */ - UtAssert_VOIDCALL(DS_CmdRemoveMID(&UT_CmdBuf.Buf)); + UtAssert_VOIDCALL(DS_RemoveMIDCmd(&UT_CmdBuf.Buf)); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_REMOVE_MID_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } -void DS_CmdRemoveMID_Test_MessageIDNotAdded(void) +void DS_RemoveMIDCmd_Test_MessageIDNotAdded(void) { - size_t forced_Size = sizeof(DS_RemoveMidCmd_t); - CFE_SB_MsgId_t forced_MsgID = CFE_SB_ValueToMsgId(DS_CMD_MID); - CFE_MSG_FcnCode_t forced_CmdCode = DS_REMOVE_MID_CC; - DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.RemoveMidCmd.Payload; + DS_AddRemoveMid_Payload_t *CmdPayload = &UT_CmdBuf.RemoveMidCmd.Payload; - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &forced_CmdCode, sizeof(forced_CmdCode), false); UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), DS_INDEX_NONE); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid REMOVE MID command: MID = 0x%%08lX is not in filter table"); - CmdPayload->MessageID = DS_UT_MID_1; /* Execute the function being tested */ - UtAssert_VOIDCALL(DS_CmdRemoveMID(&UT_CmdBuf.Buf)); + UtAssert_VOIDCALL(DS_RemoveMIDCmd(&UT_CmdBuf.Buf)); /* Verify results */ - UtAssert_True(DS_AppData.CmdRejectedCounter == 1, "DS_AppData.CmdRejectedCounter == 1"); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_REMOVE_MID_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); } void UtTest_Setup(void) { - UtTest_Add(DS_CmdNoop_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdNoop_Test_Nominal"); - UtTest_Add(DS_CmdNoop_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdNoop_Test_InvalidCommandLength"); - - UtTest_Add(DS_CmdReset_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdReset_Test_Nominal"); - UtTest_Add(DS_CmdReset_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdReset_Test_InvalidCommandLength"); - - UtTest_Add(DS_CmdSetAppState_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetAppState_Test_Nominal"); - UtTest_Add(DS_CmdSetAppState_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetAppState_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetAppState_Test_InvalidAppState, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetAppState_Test_InvalidAppState"); - - UtTest_Add(DS_CmdSetFilterFile_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetFilterFile_Test_Nominal"); - UtTest_Add(DS_CmdSetFilterFile_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterFile_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetFilterFile_Test_InvalidMessageID, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterFile_Test_InvalidMessageID"); - UtTest_Add(DS_CmdSetFilterFile_Test_InvalidFilterParametersIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterFile_Test_InvalidFilterParametersIndex"); - UtTest_Add(DS_CmdSetFilterFile_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterFile_Test_InvalidFileTableIndex"); - UtTest_Add(DS_CmdSetFilterFile_Test_FilterTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterFile_Test_FilterTableNotLoaded"); - UtTest_Add(DS_CmdSetFilterFile_Test_MessageIDNotInFilterTable, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterFile_Test_MessageIDNotInFilterTable"); - - UtTest_Add(DS_CmdSetFilterType_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetFilterType_Test_Nominal"); - UtTest_Add(DS_CmdSetFilterType_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterType_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetFilterType_Test_InvalidMessageID, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterType_Test_InvalidMessageID"); - UtTest_Add(DS_CmdSetFilterType_Test_InvalidFilterParametersIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterType_Test_InvalidFilterParametersIndex"); - UtTest_Add(DS_CmdSetFilterType_Test_InvalidFilterType, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterType_Test_InvalidFilterType"); - UtTest_Add(DS_CmdSetFilterType_Test_FilterTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterType_Test_FilterTableNotLoaded"); - UtTest_Add(DS_CmdSetFilterType_Test_MessageIDNotInFilterTable, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterType_Test_MessageIDNotInFilterTable"); - - UtTest_Add(DS_CmdSetFilterParms_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetFilterParms_Test_Nominal"); - UtTest_Add(DS_CmdSetFilterParms_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterParms_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetFilterParms_Test_InvalidMessageID, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterParms_Test_InvalidMessageID"); - UtTest_Add(DS_CmdSetFilterParms_Test_InvalidFilterParametersIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterParms_Test_InvalidFilterParametersIndex"); - UtTest_Add(DS_CmdSetFilterParms_Test_InvalidFilterAlgorithm, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterParms_Test_InvalidFilterAlgorithm"); - UtTest_Add(DS_CmdSetFilterParms_Test_FilterTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterParms_Test_FilterTableNotLoaded"); - UtTest_Add(DS_CmdSetFilterParms_Test_MessageIDNotInFilterTable, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetFilterParms_Test_MessageIDNotInFilterTable"); - - UtTest_Add(DS_CmdSetDestType_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetDestType_Test_Nominal"); - UtTest_Add(DS_CmdSetDestType_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestType_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetDestType_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestType_Test_InvalidFileTableIndex"); - UtTest_Add(DS_CmdSetDestType_Test_InvalidFilenameType, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestType_Test_InvalidFilenameType"); - UtTest_Add(DS_CmdSetDestType_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestType_Test_FileTableNotLoaded"); - - UtTest_Add(DS_CmdSetDestState_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetDestState_Test_Nominal"); - UtTest_Add(DS_CmdSetDestState_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestState_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetDestState_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestState_Test_InvalidFileTableIndex"); - UtTest_Add(DS_CmdSetDestState_Test_InvalidFileState, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestState_Test_InvalidFileState"); - UtTest_Add(DS_CmdSetDestState_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestState_Test_FileTableNotLoaded"); - - UtTest_Add(DS_CmdSetDestPath_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetDestPath_Test_Nominal"); - UtTest_Add(DS_CmdSetDestPath_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestPath_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetDestPath_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestPath_Test_InvalidFileTableIndex"); - UtTest_Add(DS_CmdSetDestPath_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestPath_Test_FileTableNotLoaded"); - - UtTest_Add(DS_CmdSetDestBase_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetDestBase_Test_Nominal"); - UtTest_Add(DS_CmdSetDestBase_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestBase_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetDestBase_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestBase_Test_InvalidFileTableIndex"); - UtTest_Add(DS_CmdSetDestBase_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestBase_Test_FileTableNotLoaded"); - - UtTest_Add(DS_CmdSetDestExt_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetDestExt_Test_Nominal"); - UtTest_Add(DS_CmdSetDestExt_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestExt_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetDestExt_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestExt_Test_InvalidFileTableIndex"); - UtTest_Add(DS_CmdSetDestExt_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestExt_Test_FileTableNotLoaded"); - - UtTest_Add(DS_CmdSetDestSize_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetDestSize_Test_Nominal"); - UtTest_Add(DS_CmdSetDestSize_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestSize_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetDestSize_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestSize_Test_InvalidFileTableIndex"); - UtTest_Add(DS_CmdSetDestSize_Test_InvalidFileSizeLimit, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestSize_Test_InvalidFileSizeLimit"); - UtTest_Add(DS_CmdSetDestSize_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestSize_Test_FileTableNotLoaded"); - - UtTest_Add(DS_CmdSetDestAge_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetDestAge_Test_Nominal"); - UtTest_Add(DS_CmdSetDestAge_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestAge_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetDestAge_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestAge_Test_InvalidFileTableIndex"); - UtTest_Add(DS_CmdSetDestAge_Test_InvalidFileAgeLimit, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestAge_Test_InvalidFileAgeLimit"); - UtTest_Add(DS_CmdSetDestAge_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestAge_Test_FileTableNotLoaded"); - - UtTest_Add(DS_CmdSetDestCount_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdSetDestCount_Test_Nominal"); - UtTest_Add(DS_CmdSetDestCount_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestCount_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdSetDestCount_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestCount_Test_InvalidFileTableIndex"); - UtTest_Add(DS_CmdSetDestCount_Test_InvalidFileSequenceCount, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestCount_Test_InvalidFileSequenceCount"); - UtTest_Add(DS_CmdSetDestCount_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdSetDestCount_Test_FileTableNotLoaded"); - - UtTest_Add(DS_CmdCloseFile_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdCloseFile_Test_Nominal"); - UtTest_Add(DS_CmdCloseFile_Test_NominalAlreadyClosed, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdCloseFile_Test_NominalAlreadyClosed"); - UtTest_Add(DS_CmdCloseFile_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdCloseFile_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdCloseFile_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdCloseFile_Test_InvalidFileTableIndex"); - - UtTest_Add(DS_CmdCloseAll_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdCloseAll_Test_Nominal"); - UtTest_Add(DS_CmdCloseAll_Test_CloseAll, DS_Test_Setup, DS_Test_TearDown, "DS_CmdCloseAll_Test_CloseAll"); - UtTest_Add(DS_CmdCloseAll_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdCloseAll_Test_InvalidCommandLength"); - - UtTest_Add(DS_CmdGetFileInfo_Test_EnabledOpen, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdGetFileInfo_Test_EnabledOpen"); - UtTest_Add(DS_CmdGetFileInfo_Test_DisabledClosed, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdGetFileInfo_Test_DisabledClosed"); - UtTest_Add(DS_CmdGetFileInfo_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdGetFileInfo_Test_InvalidCommandLength"); - - UtTest_Add(DS_CmdAddMID_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdAddMID_Test_Nominal"); - UtTest_Add(DS_CmdAddMID_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdAddMID_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdAddMID_Test_InvalidMessageID, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdAddMID_Test_InvalidMessageID"); - UtTest_Add(DS_CmdAddMID_Test_FilterTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdAddMID_Test_FilterTableNotLoaded"); - UtTest_Add(DS_CmdAddMID_Test_MIDAlreadyInFilterTable, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdAddMID_Test_MIDAlreadyInFilterTable"); - UtTest_Add(DS_CmdAddMID_Test_FilterTableFull, DS_Test_Setup, DS_Test_TearDown, "DS_CmdAddMID_Test_FilterTableFull"); - - UtTest_Add(DS_CmdRemoveMID_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CmdRemoveMID_Test_Nominal"); - UtTest_Add(DS_CmdRemoveMID_Test_InvalidCommandLength, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdRemoveMID_Test_InvalidCommandLength"); - UtTest_Add(DS_CmdRemoveMID_Test_InvalidMessageID, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdRemoveMID_Test_InvalidMessageID"); - UtTest_Add(DS_CmdRemoveMID_Test_FilterTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdRemoveMID_Test_FilterTableNotLoaded"); - UtTest_Add(DS_CmdRemoveMID_Test_MessageIDNotAdded, DS_Test_Setup, DS_Test_TearDown, - "DS_CmdRemoveMID_Test_MessageIDNotAdded"); + UtTest_Add(DS_NoopCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_NoopCmd_Test_Nominal"); + + UtTest_Add(DS_ResetCountersCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_ResetCountersCmd_Test_Nominal"); + + UtTest_Add(DS_SetAppStateCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetAppStateCmd_Test_Nominal"); + UtTest_Add(DS_SetAppStateCmd_Test_InvalidAppState, DS_Test_Setup, DS_Test_TearDown, + "DS_SetAppStateCmd_Test_InvalidAppState"); + + UtTest_Add(DS_SetFilterFileCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetFilterFileCmd_Test_Nominal"); + UtTest_Add(DS_SetFilterFileCmd_Test_InvalidMessageID, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterFileCmd_Test_InvalidMessageID"); + UtTest_Add(DS_SetFilterFileCmd_Test_InvalidFilterParametersIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterFileCmd_Test_InvalidFilterParametersIndex"); + UtTest_Add(DS_SetFilterFileCmd_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterFileCmd_Test_InvalidFileTableIndex"); + UtTest_Add(DS_SetFilterFileCmd_Test_FilterTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterFileCmd_Test_FilterTableNotLoaded"); + UtTest_Add(DS_SetFilterFileCmd_Test_MessageIDNotInFilterTable, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterFileCmd_Test_MessageIDNotInFilterTable"); + + UtTest_Add(DS_SetFilterTypeCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetFilterTypeCmd_Test_Nominal"); + UtTest_Add(DS_SetFilterTypeCmd_Test_InvalidMessageID, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterTypeCmd_Test_InvalidMessageID"); + UtTest_Add(DS_SetFilterTypeCmd_Test_InvalidFilterParametersIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterTypeCmd_Test_InvalidFilterParametersIndex"); + UtTest_Add(DS_SetFilterTypeCmd_Test_InvalidFilterType, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterTypeCmd_Test_InvalidFilterType"); + UtTest_Add(DS_SetFilterTypeCmd_Test_FilterTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterTypeCmd_Test_FilterTableNotLoaded"); + UtTest_Add(DS_SetFilterTypeCmd_Test_MessageIDNotInFilterTable, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterTypeCmd_Test_MessageIDNotInFilterTable"); + + UtTest_Add(DS_SetFilterParmsCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetFilterParmsCmd_Test_Nominal"); + UtTest_Add(DS_SetFilterParmsCmd_Test_InvalidMessageID, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterParmsCmd_Test_InvalidMessageID"); + UtTest_Add(DS_SetFilterParmsCmd_Test_InvalidFilterParametersIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterParmsCmd_Test_InvalidFilterParametersIndex"); + UtTest_Add(DS_SetFilterParmsCmd_Test_InvalidFilterAlgorithm, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterParmsCmd_Test_InvalidFilterAlgorithm"); + UtTest_Add(DS_SetFilterParmsCmd_Test_FilterTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterParmsCmd_Test_FilterTableNotLoaded"); + UtTest_Add(DS_SetFilterParmsCmd_Test_MessageIDNotInFilterTable, DS_Test_Setup, DS_Test_TearDown, + "DS_SetFilterParmsCmd_Test_MessageIDNotInFilterTable"); + + UtTest_Add(DS_SetDestTypeCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetDestTypeCmd_Test_Nominal"); + UtTest_Add(DS_SetDestTypeCmd_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestTypeCmd_Test_InvalidFileTableIndex"); + UtTest_Add(DS_SetDestTypeCmd_Test_InvalidFilenameType, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestTypeCmd_Test_InvalidFilenameType"); + UtTest_Add(DS_SetDestTypeCmd_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestTypeCmd_Test_FileTableNotLoaded"); + + UtTest_Add(DS_SetDestStateCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetDestStateCmd_Test_Nominal"); + UtTest_Add(DS_SetDestStateCmd_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestStateCmd_Test_InvalidFileTableIndex"); + UtTest_Add(DS_SetDestStateCmd_Test_InvalidFileState, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestStateCmd_Test_InvalidFileState"); + UtTest_Add(DS_SetDestStateCmd_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestStateCmd_Test_FileTableNotLoaded"); + + UtTest_Add(DS_SetDestPathCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetDestPathCmd_Test_Nominal"); + UtTest_Add(DS_SetDestPathCmd_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestPathCmd_Test_InvalidFileTableIndex"); + UtTest_Add(DS_SetDestPathCmd_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestPathCmd_Test_FileTableNotLoaded"); + + UtTest_Add(DS_SetDestBaseCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetDestBaseCmd_Test_Nominal"); + UtTest_Add(DS_SetDestBaseCmd_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestBaseCmd_Test_InvalidFileTableIndex"); + UtTest_Add(DS_SetDestBaseCmd_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestBaseCmd_Test_FileTableNotLoaded"); + + UtTest_Add(DS_SetDestExtCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetDestExtCmd_Test_Nominal"); + UtTest_Add(DS_SetDestExtCmd_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestExtCmd_Test_InvalidFileTableIndex"); + UtTest_Add(DS_SetDestExtCmd_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestExtCmd_Test_FileTableNotLoaded"); + + UtTest_Add(DS_SetDestSizeCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetDestSizeCmd_Test_Nominal"); + UtTest_Add(DS_SetDestSizeCmd_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestSizeCmd_Test_InvalidFileTableIndex"); + UtTest_Add(DS_SetDestSizeCmd_Test_InvalidFileSizeLimit, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestSizeCmd_Test_InvalidFileSizeLimit"); + UtTest_Add(DS_SetDestSizeCmd_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestSizeCmd_Test_FileTableNotLoaded"); + + UtTest_Add(DS_SetDestAgeCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetDestAgeCmd_Test_Nominal"); + UtTest_Add(DS_SetDestAgeCmd_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestAgeCmd_Test_InvalidFileTableIndex"); + UtTest_Add(DS_SetDestAgeCmd_Test_InvalidFileAgeLimit, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestAgeCmd_Test_InvalidFileAgeLimit"); + UtTest_Add(DS_SetDestAgeCmd_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestAgeCmd_Test_FileTableNotLoaded"); + + UtTest_Add(DS_SetDestCountCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_SetDestCountCmd_Test_Nominal"); + UtTest_Add(DS_SetDestCountCmd_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestCountCmd_Test_InvalidFileTableIndex"); + UtTest_Add(DS_SetDestCountCmd_Test_InvalidFileSequenceCount, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestCountCmd_Test_InvalidFileSequenceCount"); + UtTest_Add(DS_SetDestCountCmd_Test_FileTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_SetDestCountCmd_Test_FileTableNotLoaded"); + + UtTest_Add(DS_CloseFileCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CloseFileCmd_Test_Nominal"); + UtTest_Add(DS_CloseFileCmd_Test_NominalAlreadyClosed, DS_Test_Setup, DS_Test_TearDown, + "DS_CloseFileCmd_Test_NominalAlreadyClosed"); + UtTest_Add(DS_CloseFileCmd_Test_InvalidFileTableIndex, DS_Test_Setup, DS_Test_TearDown, + "DS_CloseFileCmd_Test_InvalidFileTableIndex"); + + UtTest_Add(DS_CloseAllCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_CloseAllCmd_Test_Nominal"); + UtTest_Add(DS_CloseAllCmd_Test_CloseAll, DS_Test_Setup, DS_Test_TearDown, "DS_CloseAllCmd_Test_CloseAll"); + + UtTest_Add(DS_GetFileInfoCmd_Test_EnabledOpen, DS_Test_Setup, DS_Test_TearDown, + "DS_GetFileInfoCmd_Test_EnabledOpen"); + UtTest_Add(DS_GetFileInfoCmd_Test_DisabledClosed, DS_Test_Setup, DS_Test_TearDown, + "DS_GetFileInfoCmd_Test_DisabledClosed"); + + UtTest_Add(DS_AddMIDCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_AddMIDCmd_Test_Nominal"); + UtTest_Add(DS_AddMIDCmd_Test_InvalidMessageID, DS_Test_Setup, DS_Test_TearDown, + "DS_AddMIDCmd_Test_InvalidMessageID"); + UtTest_Add(DS_AddMIDCmd_Test_FilterTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_AddMIDCmd_Test_FilterTableNotLoaded"); + UtTest_Add(DS_AddMIDCmd_Test_MIDAlreadyInFilterTable, DS_Test_Setup, DS_Test_TearDown, + "DS_AddMIDCmd_Test_MIDAlreadyInFilterTable"); + UtTest_Add(DS_AddMIDCmd_Test_FilterTableFull, DS_Test_Setup, DS_Test_TearDown, "DS_AddMIDCmd_Test_FilterTableFull"); + + UtTest_Add(DS_RemoveMIDCmd_Test_Nominal, DS_Test_Setup, DS_Test_TearDown, "DS_RemoveMIDCmd_Test_Nominal"); + UtTest_Add(DS_RemoveMIDCmd_Test_InvalidMessageID, DS_Test_Setup, DS_Test_TearDown, + "DS_RemoveMIDCmd_Test_InvalidMessageID"); + UtTest_Add(DS_RemoveMIDCmd_Test_FilterTableNotLoaded, DS_Test_Setup, DS_Test_TearDown, + "DS_RemoveMIDCmd_Test_FilterTableNotLoaded"); + UtTest_Add(DS_RemoveMIDCmd_Test_MessageIDNotAdded, DS_Test_Setup, DS_Test_TearDown, + "DS_RemoveMIDCmd_Test_MessageIDNotAdded"); } diff --git a/unit-test/ds_dispatch_tests.c b/unit-test/ds_dispatch_tests.c new file mode 100644 index 0000000..c92cc0a --- /dev/null +++ b/unit-test/ds_dispatch_tests.c @@ -0,0 +1,581 @@ +/************************************************************************ + * NASA Docket No. GSC-18,917-1, and identified as “CFS Data Storage + * (DS) application version 2.6.1” + * + * Copyright (c) 2021 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + +/** + * @file + * This file contains unit test cases for the functions contained in the file ds_app.c + */ + +/* + * Includes + */ + +#include "ds_dispatch.h" +#include "ds_msg.h" +#include "ds_msgdefs.h" +#include "ds_msgids.h" +#include "ds_events.h" +#include "ds_test_utils.h" +#include "ds_cmds.h" + +/* UT includes */ +#include "uttest.h" +#include "utassert.h" +#include "utstubs.h" + +#include +#include + +static void DS_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}; + + UT_ResetState(UT_KEY(CFE_MSG_GetMsgId)); + UT_ResetState(UT_KEY(CFE_MSG_GetFcnCode)); + UT_ResetState(UT_KEY(CFE_MSG_GetSize)); + + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), RegMsgId, sizeof(RegMsgId), true); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), RegFcnCode, sizeof(RegFcnCode), true); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), RegMsgSize, sizeof(RegMsgSize), true); +} + +void DS_AppProcessMsg_Test_CmdStore(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_NOOP_CC, sizeof(DS_NoopCmd_t)); + + DS_AppData.AppEnableState = DS_DISABLED; + DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; + + UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), 1); + + /* Execute the function being tested */ + DS_AppProcessMsg(&UT_CmdBuf.Buf); + + /* an attempt was made to store this packet */ + UtAssert_STUB_COUNT(DS_AppStorePacket, 1); +} + +void DS_AppProcessMsg_Test_CmdNoStore(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_NOOP_CC, sizeof(DS_NoopCmd_t)); + + DS_AppData.AppEnableState = DS_DISABLED; + DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; + + UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), DS_INDEX_NONE); + + /* Execute the function being tested */ + DS_AppProcessMsg(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); + + /* no attempt was made to store this packet */ + UtAssert_STUB_COUNT(DS_AppStorePacket, 0); +} + +void DS_AppProcessMsg_Test_HKStore(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_SEND_HK_MID), 0, sizeof(DS_SendHkCmd_t)); + + DS_AppData.AppEnableState = DS_DISABLED; + DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; + + UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), 1); + + /* Execute the function being tested */ + DS_AppProcessMsg(&UT_CmdBuf.Buf); + + UtAssert_STUB_COUNT(DS_AppSendHkCmd, 1); + + /* an attempt was made to store this packet */ + UtAssert_STUB_COUNT(DS_AppStorePacket, 1); +} + +void DS_AppProcessMsg_Test_HKNoStore(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_SEND_HK_MID), 0, sizeof(DS_SendHkCmd_t)); + + DS_AppData.AppEnableState = DS_DISABLED; + DS_AppData.FilterTblPtr->Packet->MessageID = DS_UT_MID_1; + + UT_SetDefaultReturnValue(UT_KEY(DS_TableFindMsgID), DS_INDEX_NONE); + + /* Execute the function being tested */ + DS_AppProcessMsg(&UT_CmdBuf.Buf); + + UtAssert_STUB_COUNT(DS_AppSendHkCmd, 1); + + /* an attempt was made to store this packet */ + UtAssert_STUB_COUNT(DS_AppStorePacket, 0); +} + +void DS_AppProcessMsg_Test_HKInvalidRequest(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_SEND_HK_MID), 0, 1); + + /* Execute the function being tested */ + DS_AppProcessMsg(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, DS_HK_REQUEST_ERR_EID); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); +} + +void DS_AppProcessMsg_Test_UnknownMID(void) +{ + DS_Dispatch_Test_SetupMsg(DS_UT_MID_1, 0, 1); + + /* Execute the function being tested */ + DS_AppProcessMsg(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); + + /* an attempt was made to store this packet */ + UtAssert_STUB_COUNT(DS_AppStorePacket, 1); +} + +void DS_AppProcessCmd_Test_Noop(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_NOOP_CC, sizeof(DS_NoopCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_NoopCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_NOOP_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_NoopCmd, 1); +} + +void DS_AppProcessCmd_Test_Reset(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_RESET_COUNTERS_CC, sizeof(DS_ResetCountersCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_ResetCountersCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_RESET_COUNTERS_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_ResetCountersCmd, 1); +} + +void DS_AppProcessCmd_Test_SetAppState(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_APP_STATE_CC, sizeof(DS_AppStateCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetAppStateCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_APP_STATE_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_SetAppStateCmd, 1); +} + +void DS_AppProcessCmd_Test_SetFilterFile(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_FILTER_FILE_CC, sizeof(DS_FilterFileCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetFilterFileCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_FILTER_FILE_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_SetFilterFileCmd, 1); +} + +void DS_AppProcessCmd_Test_SetFilterType(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_FILTER_TYPE_CC, sizeof(DS_FilterTypeCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetFilterTypeCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_FILTER_TYPE_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_SetFilterTypeCmd, 1); +} + +void DS_AppProcessCmd_Test_SetFilterParms(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_FILTER_PARMS_CC, sizeof(DS_FilterParmsCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetFilterParmsCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_FILTER_PARMS_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_SetFilterParmsCmd, 1); +} + +void DS_AppProcessCmd_Test_SetDestType(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_TYPE_CC, sizeof(DS_DestTypeCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetDestTypeCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_TYPE_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_SetDestTypeCmd, 1); +} + +void DS_AppProcessCmd_Test_SetDestState(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_STATE_CC, sizeof(DS_DestStateCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetDestStateCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_STATE_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_SetDestStateCmd, 1); +} + +void DS_AppProcessCmd_Test_SetDestPath(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_PATH_CC, sizeof(DS_DestPathCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetDestPathCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_PATH_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_SetDestPathCmd, 1); +} + +void DS_AppProcessCmd_Test_SetDestBase(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_BASE_CC, sizeof(DS_DestBaseCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetDestBaseCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_BASE_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetDestBaseCmd, 1); +} + +void DS_AppProcessCmd_Test_SetDestExt(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_EXT_CC, sizeof(DS_DestExtCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetDestExtCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_EXT_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_SetDestExtCmd, 1); +} + +void DS_AppProcessCmd_Test_SetDestSize(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_SIZE_CC, sizeof(DS_DestSizeCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetDestSizeCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_SIZE_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_SetDestSizeCmd, 1); +} + +void DS_AppProcessCmd_Test_SetDestAge(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_AGE_CC, sizeof(DS_DestAgeCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetDestAgeCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_AGE_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_SetDestAgeCmd, 1); +} + +void DS_AppProcessCmd_Test_SetDestCount(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_COUNT_CC, sizeof(DS_DestCountCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_SetDestCountCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_SET_DEST_COUNT_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_SetDestCountCmd, 1); +} + +void DS_AppProcessCmd_Test_CloseFile(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_CLOSE_FILE_CC, sizeof(DS_CloseFileCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_CloseFileCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_CLOSE_FILE_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_CloseFileCmd, 1); +} + +void DS_AppProcessCmd_Test_GetFileInfo(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_GET_FILE_INFO_CC, sizeof(DS_GetFileInfoCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_GetFileInfoCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_GET_FILE_INFO_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_GetFileInfoCmd, 1); +} + +void DS_AppProcessCmd_Test_AddMID(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_ADD_MID_CC, sizeof(DS_AddMidCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_AddMIDCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_ADD_MID_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_AddMIDCmd, 1); +} + +void DS_AppProcessCmd_Test_RemoveMID(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_REMOVE_MID_CC, sizeof(DS_RemoveMidCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_RemoveMIDCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_REMOVE_MID_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_RemoveMIDCmd, 1); +} + +void DS_AppProcessCmd_Test_CloseAll(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_CLOSE_ALL_CC, sizeof(DS_CloseAllCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_STUB_COUNT(DS_CloseAllCmd, 1); + + /* Now with an invalid size */ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), DS_CLOSE_ALL_CC, 1); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Should NOT have invoked the handler this time */ + UtAssert_STUB_COUNT(DS_CloseAllCmd, 1); +} + +void DS_AppProcessCmd_Test_InvalidCommandCode(void) +{ + DS_Dispatch_Test_SetupMsg(CFE_SB_ValueToMsgId(DS_CMD_MID), 99, sizeof(DS_CloseAllCmd_t)); + + /* Execute the function being tested */ + DS_AppProcessCmd(&UT_CmdBuf.Buf); + + /* Verify results */ + UtAssert_UINT32_EQ(DS_AppData.CmdRejectedCounter, 1); + + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); +} + +void UtTest_Setup(void) +{ + UT_DS_TEST_ADD(DS_AppProcessMsg_Test_CmdStore); + UT_DS_TEST_ADD(DS_AppProcessMsg_Test_CmdNoStore); + UT_DS_TEST_ADD(DS_AppProcessMsg_Test_HKStore); + UT_DS_TEST_ADD(DS_AppProcessMsg_Test_HKNoStore); + UT_DS_TEST_ADD(DS_AppProcessMsg_Test_HKInvalidRequest); + UT_DS_TEST_ADD(DS_AppProcessMsg_Test_UnknownMID); + + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_Noop); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_Reset); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetAppState); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetFilterFile); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetFilterType); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetFilterParms); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestType); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestState); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestPath); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestBase); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestExt); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestSize); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestAge); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_SetDestCount); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_CloseFile); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_GetFileInfo); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_AddMID); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_RemoveMID); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_CloseAll); + UT_DS_TEST_ADD(DS_AppProcessCmd_Test_InvalidCommandCode); +} diff --git a/unit-test/stubs/ds_app_stubs.c b/unit-test/stubs/ds_app_stubs.c index 4f20804..24e6b40 100644 --- a/unit-test/stubs/ds_app_stubs.c +++ b/unit-test/stubs/ds_app_stubs.c @@ -53,37 +53,13 @@ void DS_AppMain(void) /* * ---------------------------------------------------- - * Generated stub function for DS_AppProcessCmd() + * Generated stub function for DS_AppSendHkCmd() * ---------------------------------------------------- */ -void DS_AppProcessCmd(const CFE_SB_Buffer_t *BufPtr) +void DS_AppSendHkCmd(void) { - UT_GenStub_AddParam(DS_AppProcessCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_AppProcessCmd, Basic, NULL); -} - -/* - * ---------------------------------------------------- - * Generated stub function for DS_AppProcessHK() - * ---------------------------------------------------- - */ -void DS_AppProcessHK(void) -{ - - UT_GenStub_Execute(DS_AppProcessHK, Basic, NULL); -} - -/* - * ---------------------------------------------------- - * Generated stub function for DS_AppProcessMsg() - * ---------------------------------------------------- - */ -void DS_AppProcessMsg(const CFE_SB_Buffer_t *BufPtr) -{ - UT_GenStub_AddParam(DS_AppProcessMsg, const CFE_SB_Buffer_t *, BufPtr); - - UT_GenStub_Execute(DS_AppProcessMsg, Basic, NULL); + UT_GenStub_Execute(DS_AppSendHkCmd, Basic, NULL); } /* diff --git a/unit-test/stubs/ds_cmds_stubs.c b/unit-test/stubs/ds_cmds_stubs.c index 6a3d76d..3d4978a 100644 --- a/unit-test/stubs/ds_cmds_stubs.c +++ b/unit-test/stubs/ds_cmds_stubs.c @@ -28,228 +28,228 @@ /* * ---------------------------------------------------- - * Generated stub function for DS_CmdAddMID() + * Generated stub function for DS_AddMIDCmd() * ---------------------------------------------------- */ -void DS_CmdAddMID(const CFE_SB_Buffer_t *BufPtr) +void DS_AddMIDCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdAddMID, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_AddMIDCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdAddMID, Basic, NULL); + UT_GenStub_Execute(DS_AddMIDCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdCloseAll() + * Generated stub function for DS_CloseAllCmd() * ---------------------------------------------------- */ -void DS_CmdCloseAll(const CFE_SB_Buffer_t *BufPtr) +void DS_CloseAllCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdCloseAll, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_CloseAllCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdCloseAll, Basic, NULL); + UT_GenStub_Execute(DS_CloseAllCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdCloseFile() + * Generated stub function for DS_CloseFileCmd() * ---------------------------------------------------- */ -void DS_CmdCloseFile(const CFE_SB_Buffer_t *BufPtr) +void DS_CloseFileCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdCloseFile, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_CloseFileCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdCloseFile, Basic, NULL); + UT_GenStub_Execute(DS_CloseFileCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdGetFileInfo() + * Generated stub function for DS_GetFileInfoCmd() * ---------------------------------------------------- */ -void DS_CmdGetFileInfo(const CFE_SB_Buffer_t *BufPtr) +void DS_GetFileInfoCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdGetFileInfo, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_GetFileInfoCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdGetFileInfo, Basic, NULL); + UT_GenStub_Execute(DS_GetFileInfoCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdNoop() + * Generated stub function for DS_NoopCmd() * ---------------------------------------------------- */ -void DS_CmdNoop(const CFE_SB_Buffer_t *BufPtr) +void DS_NoopCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdNoop, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_NoopCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdNoop, Basic, NULL); + UT_GenStub_Execute(DS_NoopCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdRemoveMID() + * Generated stub function for DS_RemoveMIDCmd() * ---------------------------------------------------- */ -void DS_CmdRemoveMID(const CFE_SB_Buffer_t *BufPtr) +void DS_RemoveMIDCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdRemoveMID, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_RemoveMIDCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdRemoveMID, Basic, NULL); + UT_GenStub_Execute(DS_RemoveMIDCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdReset() + * Generated stub function for DS_ResetCountersCmd() * ---------------------------------------------------- */ -void DS_CmdReset(const CFE_SB_Buffer_t *BufPtr) +void DS_ResetCountersCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdReset, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_ResetCountersCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdReset, Basic, NULL); + UT_GenStub_Execute(DS_ResetCountersCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetAppState() + * Generated stub function for DS_SetAppStateCmd() * ---------------------------------------------------- */ -void DS_CmdSetAppState(const CFE_SB_Buffer_t *BufPtr) +void DS_SetAppStateCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetAppState, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetAppStateCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetAppState, Basic, NULL); + UT_GenStub_Execute(DS_SetAppStateCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetDestAge() + * Generated stub function for DS_SetDestAgeCmd() * ---------------------------------------------------- */ -void DS_CmdSetDestAge(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestAgeCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetDestAge, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetDestAgeCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetDestAge, Basic, NULL); + UT_GenStub_Execute(DS_SetDestAgeCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetDestBase() + * Generated stub function for DS_SetDestBaseCmd() * ---------------------------------------------------- */ -void DS_CmdSetDestBase(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestBaseCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetDestBase, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetDestBaseCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetDestBase, Basic, NULL); + UT_GenStub_Execute(DS_SetDestBaseCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetDestCount() + * Generated stub function for DS_SetDestCountCmd() * ---------------------------------------------------- */ -void DS_CmdSetDestCount(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestCountCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetDestCount, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetDestCountCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetDestCount, Basic, NULL); + UT_GenStub_Execute(DS_SetDestCountCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetDestExt() + * Generated stub function for DS_SetDestExtCmd() * ---------------------------------------------------- */ -void DS_CmdSetDestExt(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestExtCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetDestExt, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetDestExtCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetDestExt, Basic, NULL); + UT_GenStub_Execute(DS_SetDestExtCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetDestPath() + * Generated stub function for DS_SetDestPathCmd() * ---------------------------------------------------- */ -void DS_CmdSetDestPath(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestPathCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetDestPath, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetDestPathCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetDestPath, Basic, NULL); + UT_GenStub_Execute(DS_SetDestPathCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetDestSize() + * Generated stub function for DS_SetDestSizeCmd() * ---------------------------------------------------- */ -void DS_CmdSetDestSize(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestSizeCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetDestSize, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetDestSizeCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetDestSize, Basic, NULL); + UT_GenStub_Execute(DS_SetDestSizeCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetDestState() + * Generated stub function for DS_SetDestStateCmd() * ---------------------------------------------------- */ -void DS_CmdSetDestState(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestStateCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetDestState, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetDestStateCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetDestState, Basic, NULL); + UT_GenStub_Execute(DS_SetDestStateCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetDestType() + * Generated stub function for DS_SetDestTypeCmd() * ---------------------------------------------------- */ -void DS_CmdSetDestType(const CFE_SB_Buffer_t *BufPtr) +void DS_SetDestTypeCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetDestType, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetDestTypeCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetDestType, Basic, NULL); + UT_GenStub_Execute(DS_SetDestTypeCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetFilterFile() + * Generated stub function for DS_SetFilterFileCmd() * ---------------------------------------------------- */ -void DS_CmdSetFilterFile(const CFE_SB_Buffer_t *BufPtr) +void DS_SetFilterFileCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetFilterFile, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetFilterFileCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetFilterFile, Basic, NULL); + UT_GenStub_Execute(DS_SetFilterFileCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetFilterParms() + * Generated stub function for DS_SetFilterParmsCmd() * ---------------------------------------------------- */ -void DS_CmdSetFilterParms(const CFE_SB_Buffer_t *BufPtr) +void DS_SetFilterParmsCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetFilterParms, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetFilterParmsCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetFilterParms, Basic, NULL); + UT_GenStub_Execute(DS_SetFilterParmsCmd, Basic, NULL); } /* * ---------------------------------------------------- - * Generated stub function for DS_CmdSetFilterType() + * Generated stub function for DS_SetFilterTypeCmd() * ---------------------------------------------------- */ -void DS_CmdSetFilterType(const CFE_SB_Buffer_t *BufPtr) +void DS_SetFilterTypeCmd(const CFE_SB_Buffer_t *BufPtr) { - UT_GenStub_AddParam(DS_CmdSetFilterType, const CFE_SB_Buffer_t *, BufPtr); + UT_GenStub_AddParam(DS_SetFilterTypeCmd, const CFE_SB_Buffer_t *, BufPtr); - UT_GenStub_Execute(DS_CmdSetFilterType, Basic, NULL); + UT_GenStub_Execute(DS_SetFilterTypeCmd, Basic, NULL); } diff --git a/unit-test/stubs/ds_dispatch_stubs.c b/unit-test/stubs/ds_dispatch_stubs.c new file mode 100644 index 0000000..da0fba4 --- /dev/null +++ b/unit-test/stubs/ds_dispatch_stubs.c @@ -0,0 +1,51 @@ +/************************************************************************ + * NASA Docket No. GSC-18,917-1, and identified as “CFS Data Storage + * (DS) application version 2.6.1” + * + * Copyright (c) 2021 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + +/** + * @file + * + * Auto-Generated stub implementations for functions defined in ds_dispatch header + */ + +#include "ds_dispatch.h" +#include "utgenstub.h" + +/* + * ---------------------------------------------------- + * Generated stub function for DS_AppProcessCmd() + * ---------------------------------------------------- + */ +void DS_AppProcessCmd(const CFE_SB_Buffer_t *BufPtr) +{ + UT_GenStub_AddParam(DS_AppProcessCmd, const CFE_SB_Buffer_t *, BufPtr); + + UT_GenStub_Execute(DS_AppProcessCmd, Basic, NULL); +} + +/* + * ---------------------------------------------------- + * Generated stub function for DS_AppProcessMsg() + * ---------------------------------------------------- + */ +void DS_AppProcessMsg(const CFE_SB_Buffer_t *BufPtr) +{ + UT_GenStub_AddParam(DS_AppProcessMsg, const CFE_SB_Buffer_t *, BufPtr); + + UT_GenStub_Execute(DS_AppProcessMsg, Basic, NULL); +} diff --git a/unit-test/utilities/ds_test_utils.h b/unit-test/utilities/ds_test_utils.h index 9b576e9..2b09a2e 100644 --- a/unit-test/utilities/ds_test_utils.h +++ b/unit-test/utilities/ds_test_utils.h @@ -51,26 +51,26 @@ extern CFE_ES_WriteToSysLog_context_t context_CFE_ES_WriteToSysLog; /* Command buffer typedef for any handler */ typedef union { - CFE_SB_Buffer_t Buf; - DS_NoopCmd_t NoopCmd; - DS_ResetCmd_t ResetCmd; - DS_AppStateCmd_t AppStateCmd; - DS_FilterFileCmd_t FilterFileCmd; - DS_FilterTypeCmd_t FilterTypeCmd; - DS_FilterParmsCmd_t FilterParmsCmd; - DS_DestTypeCmd_t DestTypeCmd; - DS_DestStateCmd_t DestStateCmd; - DS_DestPathCmd_t DestPathCmd; - DS_DestBaseCmd_t DestBaseCmd; - DS_DestExtCmd_t DestExtCmd; - DS_DestSizeCmd_t DestSizeCmd; - DS_DestAgeCmd_t DestAgeCmd; - DS_DestCountCmd_t DestCountCmd; - DS_CloseFileCmd_t CloseFileCmd; - DS_CloseAllCmd_t CloseAllCmd; - DS_GetFileInfoCmd_t GetFileInfoCmd; - DS_AddMidCmd_t AddMidCmd; - DS_RemoveMidCmd_t RemoveMidCmd; + CFE_SB_Buffer_t Buf; + DS_NoopCmd_t NoopCmd; + DS_ResetCountersCmd_t ResetCmd; + DS_AppStateCmd_t AppStateCmd; + DS_FilterFileCmd_t FilterFileCmd; + DS_FilterTypeCmd_t FilterTypeCmd; + DS_FilterParmsCmd_t FilterParmsCmd; + DS_DestTypeCmd_t DestTypeCmd; + DS_DestStateCmd_t DestStateCmd; + DS_DestPathCmd_t DestPathCmd; + DS_DestBaseCmd_t DestBaseCmd; + DS_DestExtCmd_t DestExtCmd; + DS_DestSizeCmd_t DestSizeCmd; + DS_DestAgeCmd_t DestAgeCmd; + DS_DestCountCmd_t DestCountCmd; + DS_CloseFileCmd_t CloseFileCmd; + DS_CloseAllCmd_t CloseAllCmd; + DS_GetFileInfoCmd_t GetFileInfoCmd; + DS_AddMidCmd_t AddMidCmd; + DS_RemoveMidCmd_t RemoveMidCmd; } UT_CmdBuf_t; extern UT_CmdBuf_t UT_CmdBuf;