From 7ba4073e5629a32b33f3ff452d523670265956d0 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Mon, 30 Nov 2020 10:48:59 -0500 Subject: [PATCH] Fix #1009, Alignment pattern - unit tests - Replaced CFE_SB_SendMsg and CFE_SB_PassMsg with CFE_SB_TransmitMsg - Replaced CFE_SB_ZeroCopySend and CFE_SB_ZeroCopyPass with CFE_SB_TransmitBuffer - Replaced CFE_SB_RcvMsg with CFE_SB_ReceiveBuffer - Used CFE_SB_Buffer_t and CFE_MSG_Message_t where appropriate - Added Cmd to all command types - Changed Syslog to SysLog for consistency - Removed "see also" blocks in documentation, APIs are already grouped and these typically don't add anything useful (simplifies maintenance) --- fsw/cfe-core/unit-test/CMakeLists.txt | 2 +- fsw/cfe-core/unit-test/es_UT.c | 231 +++---- fsw/cfe-core/unit-test/es_UT.h | 77 --- fsw/cfe-core/unit-test/evs_UT.c | 42 +- fsw/cfe-core/unit-test/evs_UT.h | 83 --- fsw/cfe-core/unit-test/sb_UT.c | 912 +++++++++++++------------- fsw/cfe-core/unit-test/sb_UT.h | 142 ++-- fsw/cfe-core/unit-test/tbl_UT.c | 46 +- fsw/cfe-core/unit-test/tbl_UT.h | 12 +- fsw/cfe-core/unit-test/time_UT.c | 36 +- fsw/cfe-core/unit-test/time_UT.h | 71 -- fsw/cfe-core/unit-test/ut_support.c | 21 +- fsw/cfe-core/unit-test/ut_support.h | 2 +- 13 files changed, 726 insertions(+), 951 deletions(-) diff --git a/fsw/cfe-core/unit-test/CMakeLists.txt b/fsw/cfe-core/unit-test/CMakeLists.txt index 7e79e5c69..9df8b60af 100644 --- a/fsw/cfe-core/unit-test/CMakeLists.txt +++ b/fsw/cfe-core/unit-test/CMakeLists.txt @@ -71,7 +71,7 @@ foreach(MODULE ${CFE_CORE_MODULES}) ${UT_COVERAGE_LINK_FLAGS} ut_cfe-core_support ut_cfe-core_stubs - sbr # TODO remove this + sbr # Will be removed when sbr stubs are implemented ut_assert) add_test(${UT_TARGET_NAME}_UT ${UT_TARGET_NAME}_UT) diff --git a/fsw/cfe-core/unit-test/es_UT.c b/fsw/cfe-core/unit-test/es_UT.c index 1604ae50e..36eb80ab7 100644 --- a/fsw/cfe-core/unit-test/es_UT.c +++ b/fsw/cfe-core/unit-test/es_UT.c @@ -2621,23 +2621,26 @@ void TestTask(void) osal_id_t UT_ContextTask; union { - CFE_MSG_Message_t Msg; - CFE_ES_NoArgsCmd_t NoArgsCmd; - CFE_ES_Restart_t RestartCmd; - CFE_ES_StartApp_t StartAppCmd; - CFE_ES_StopApp_t StopAppCmd; - CFE_ES_RestartApp_t RestartAppCmd; - CFE_ES_ReloadApp_t ReloadAppCmd; - CFE_ES_QueryOne_t QueryOneCmd; - CFE_ES_QueryAll_t QueryAllCmd; - CFE_ES_OverWriteSyslog_t OverwriteSysLogCmd; - CFE_ES_WriteSyslog_t WriteSyslogCmd; - CFE_ES_WriteERLog_t WriteERlogCmd; - CFE_ES_SetMaxPRCount_t SetMaxPRCountCmd; - CFE_ES_DeleteCDS_t DeleteCDSCmd; - CFE_ES_SendMemPoolStats_t TlmPoolStatsCmd; - CFE_ES_DumpCDSRegistry_t DumpCDSRegCmd; - CFE_ES_QueryAllTasks_t QueryAllTasksCmd; + CFE_MSG_Message_t Msg; + CFE_ES_NoArgsCmd_t NoArgsCmd; + CFE_ES_ClearSysLogCmd_t ClearSysLogCmd; + CFE_ES_ClearERLogCmd_t ClearERLogCmd; + CFE_ES_ResetPRCountCmd_t ResetPRCountCmd; + CFE_ES_RestartCmd_t RestartCmd; + CFE_ES_StartAppCmd_t StartAppCmd; + CFE_ES_StopAppCmd_t StopAppCmd; + CFE_ES_RestartAppCmd_t RestartAppCmd; + CFE_ES_ReloadAppCmd_t ReloadAppCmd; + CFE_ES_QueryOneCmd_t QueryOneCmd; + CFE_ES_QueryAllCmd_t QueryAllCmd; + CFE_ES_OverWriteSysLogCmd_t OverwriteSysLogCmd; + CFE_ES_WriteSysLogCmd_t WriteSysLogCmd; + CFE_ES_WriteERLogCmd_t WriteERLogCmd; + CFE_ES_SetMaxPRCountCmd_t SetMaxPRCountCmd; + CFE_ES_DeleteCDSCmd_t DeleteCDSCmd; + CFE_ES_SendMemPoolStatsCmd_t SendMemPoolStatsCmd; + CFE_ES_DumpCDSRegistryCmd_t DumpCDSRegistryCmd; + CFE_ES_QueryAllTasksCmd_t QueryAllTasksCmd; } CmdBuf; CFE_ES_AppRecord_t *UtAppRecPtr; CFE_ES_TaskRecord_t *UtTaskRecPtr; @@ -2848,7 +2851,7 @@ void TestTask(void) /* Test cFE restart with bad restart type */ ES_ResetUnitTest(); CmdBuf.RestartCmd.Payload.RestartType = 4524; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_Restart_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.RestartCmd), UT_TPID_CFE_ES_CMD_RESTART_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_BOOT_ERR_EID), @@ -2867,7 +2870,7 @@ void TestTask(void) CmdBuf.StartAppCmd.Payload.Priority = 160; CmdBuf.StartAppCmd.Payload.StackSize = CFE_ES_MEMOFFSET_C(8192); CmdBuf.StartAppCmd.Payload.ExceptionAction = CFE_ES_ExceptionAction_RESTART_APP; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StartAppCmd), UT_TPID_CFE_ES_CMD_START_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_START_INF_EID), @@ -2877,7 +2880,7 @@ void TestTask(void) /* Test app create with an OS task create failure */ ES_ResetUnitTest(); UT_SetForceFail(UT_KEY(OS_TaskCreate), OS_ERROR); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StartAppCmd), UT_TPID_CFE_ES_CMD_START_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_START_ERR_EID), @@ -2896,7 +2899,7 @@ void TestTask(void) CmdBuf.StartAppCmd.Payload.Priority = 160; CmdBuf.StartAppCmd.Payload.StackSize = CFE_ES_MEMOFFSET_C(12096); CmdBuf.StartAppCmd.Payload.ExceptionAction = CFE_ES_ExceptionAction_RESTART_APP; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StartAppCmd), UT_TPID_CFE_ES_CMD_START_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_START_INVALID_FILENAME_ERR_EID), @@ -2915,7 +2918,7 @@ void TestTask(void) CmdBuf.StartAppCmd.Payload.Priority = 160; CmdBuf.StartAppCmd.Payload.StackSize = CFE_ES_MEMOFFSET_C(12096); CmdBuf.StartAppCmd.Payload.ExceptionAction = CFE_ES_ExceptionAction_RESTART_APP; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StartAppCmd), UT_TPID_CFE_ES_CMD_START_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_START_INVALID_ENTRY_POINT_ERR_EID), @@ -2934,7 +2937,7 @@ void TestTask(void) CmdBuf.StartAppCmd.Payload.Priority = 160; CmdBuf.StartAppCmd.Payload.StackSize = CFE_ES_MEMOFFSET_C(12096); CmdBuf.StartAppCmd.Payload.ExceptionAction = CFE_ES_ExceptionAction_RESTART_APP; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StartAppCmd), UT_TPID_CFE_ES_CMD_START_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_START_NULL_APP_NAME_ERR_EID), @@ -2953,7 +2956,7 @@ void TestTask(void) CmdBuf.StartAppCmd.Payload.Priority = 160; CmdBuf.StartAppCmd.Payload.StackSize = CFE_ES_MEMOFFSET_C(12096); CmdBuf.StartAppCmd.Payload.ExceptionAction = 255; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StartAppCmd), UT_TPID_CFE_ES_CMD_START_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_START_EXC_ACTION_ERR_EID), @@ -2972,7 +2975,7 @@ void TestTask(void) CmdBuf.StartAppCmd.Payload.Priority = 160; CmdBuf.StartAppCmd.Payload.StackSize = CFE_ES_MEMOFFSET_C(0); CmdBuf.StartAppCmd.Payload.ExceptionAction = CFE_ES_ExceptionAction_RESTART_APP; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StartAppCmd), UT_TPID_CFE_ES_CMD_START_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_START_STACK_ERR_EID), @@ -2991,7 +2994,7 @@ void TestTask(void) CmdBuf.StartAppCmd.Payload.Priority = 1000; CmdBuf.StartAppCmd.Payload.StackSize = CFE_ES_MEMOFFSET_C(12096); CmdBuf.StartAppCmd.Payload.ExceptionAction = CFE_ES_ExceptionAction_RESTART_APP; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StartAppCmd), UT_TPID_CFE_ES_CMD_START_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_START_PRIORITY_ERR_EID), @@ -3003,7 +3006,7 @@ void TestTask(void) ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, "CFE_ES", NULL, NULL); strncpy((char *) CmdBuf.StopAppCmd.Payload.Application, "CFE_ES", sizeof(CmdBuf.StopAppCmd.Payload.Application)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StopApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StopAppCmd), UT_TPID_CFE_ES_CMD_STOP_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_STOP_DBG_EID), @@ -3013,7 +3016,7 @@ void TestTask(void) /* Test app stop failure */ ES_ResetUnitTest(); ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_WAITING, "CFE_ES", NULL, NULL); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StopApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StopAppCmd), UT_TPID_CFE_ES_CMD_STOP_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_STOP_ERR1_EID), @@ -3025,7 +3028,7 @@ void TestTask(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); strncpy((char *) CmdBuf.StopAppCmd.Payload.Application, "BAD_APP_NAME", sizeof(CmdBuf.StopAppCmd.Payload.Application)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StopApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StopAppCmd), UT_TPID_CFE_ES_CMD_STOP_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_STOP_ERR2_EID), @@ -3038,7 +3041,7 @@ void TestTask(void) ES_UT_SetupSingleAppId(CFE_ES_AppType_EXTERNAL, CFE_ES_AppState_RUNNING, "CFE_ES", NULL, NULL); strncpy((char *) CmdBuf.RestartAppCmd.Payload.Application, "CFE_ES", sizeof(CmdBuf.RestartAppCmd.Payload.Application)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_RestartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.RestartAppCmd), UT_TPID_CFE_ES_CMD_RESTART_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_RESTART_APP_DBG_EID), @@ -3050,7 +3053,7 @@ void TestTask(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); strncpy((char *) CmdBuf.RestartAppCmd.Payload.Application, "BAD_APP_NAME", sizeof(CmdBuf.RestartAppCmd.Payload.Application)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_RestartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.RestartAppCmd), UT_TPID_CFE_ES_CMD_RESTART_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_RESTART_APP_ERR2_EID), @@ -3063,7 +3066,7 @@ void TestTask(void) ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_WAITING, "CFE_ES", NULL, NULL); strncpy((char *) CmdBuf.RestartAppCmd.Payload.Application, "CFE_ES", sizeof(CmdBuf.RestartAppCmd.Payload.Application)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_RestartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.RestartAppCmd), UT_TPID_CFE_ES_CMD_RESTART_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_RESTART_APP_ERR1_EID), @@ -3078,7 +3081,7 @@ void TestTask(void) sizeof(CmdBuf.ReloadAppCmd.Payload.AppFileName)); strncpy((char *) CmdBuf.ReloadAppCmd.Payload.Application, "CFE_ES", sizeof(CmdBuf.ReloadAppCmd.Payload.Application)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_ReloadApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.ReloadAppCmd), UT_TPID_CFE_ES_CMD_RELOAD_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_RELOAD_APP_DBG_EID), @@ -3090,7 +3093,7 @@ void TestTask(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); strncpy((char *) CmdBuf.ReloadAppCmd.Payload.Application, "BAD_APP_NAME", sizeof(CmdBuf.ReloadAppCmd.Payload.Application)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_ReloadApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.ReloadAppCmd), UT_TPID_CFE_ES_CMD_RELOAD_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_RELOAD_APP_ERR2_EID), @@ -3103,7 +3106,7 @@ void TestTask(void) ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_WAITING, "CFE_ES", NULL, NULL); strncpy((char *) CmdBuf.ReloadAppCmd.Payload.Application, "CFE_ES", sizeof(CmdBuf.ReloadAppCmd.Payload.Application)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_ReloadApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.ReloadAppCmd), UT_TPID_CFE_ES_CMD_RELOAD_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_RELOAD_APP_ERR1_EID), @@ -3116,23 +3119,21 @@ void TestTask(void) ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_WAITING, "CFE_ES", NULL, NULL); strncpy((char *) CmdBuf.QueryOneCmd.Payload.Application, "CFE_ES", sizeof(CmdBuf.QueryOneCmd.Payload.Application)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryOne_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryOneCmd), UT_TPID_CFE_ES_CMD_QUERY_ONE_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_ONE_APP_EID), "CFE_ES_QueryOneCmd", "Query application - success"); - /* Test telemetry packet request for single app data with failure of - * CFE_SB_SendMsg - */ + /* Test telemetry packet request for single app data with send message failure */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_RUNNING, "CFE_ES", NULL, NULL); strncpy((char *) CmdBuf.QueryOneCmd.Payload.Application, "CFE_ES", sizeof(CmdBuf.QueryOneCmd.Payload.Application)); - UT_SetDeferredRetcode(UT_KEY(CFE_SB_SendMsg), 1, -1); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryOne_t), + UT_SetDeferredRetcode(UT_KEY(CFE_SB_TransmitMsg), 1, -1); + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryOneCmd), UT_TPID_CFE_ES_CMD_QUERY_ONE_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_ONE_ERR_EID), @@ -3145,7 +3146,7 @@ void TestTask(void) ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_RUNNING, "CFE_ES", NULL, NULL); strncpy((char *) CmdBuf.QueryOneCmd.Payload.Application, "BAD_APP_NAME", sizeof(CmdBuf.QueryOneCmd.Payload.Application)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryOne_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryOneCmd), UT_TPID_CFE_ES_CMD_QUERY_ONE_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_ONE_APPID_ERR_EID), @@ -3158,7 +3159,7 @@ void TestTask(void) ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_RUNNING, "CFE_ES", NULL, NULL); strncpy((char *) CmdBuf.QueryAllCmd.Payload.FileName, "AllFilename", sizeof(CmdBuf.QueryAllCmd.Payload.FileName)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryAll_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryAllCmd), UT_TPID_CFE_ES_CMD_QUERY_ALL_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_ALL_APPS_EID), @@ -3168,7 +3169,7 @@ void TestTask(void) /* Test write of all app data to file with a null file name */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryAll_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryAllCmd), UT_TPID_CFE_ES_CMD_QUERY_ALL_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_ALL_APPS_EID), @@ -3179,7 +3180,7 @@ void TestTask(void) ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); UT_SetDeferredRetcode(UT_KEY(CFE_FS_WriteHeader), 1, OS_ERROR); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryAll_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryAllCmd), UT_TPID_CFE_ES_CMD_QUERY_ALL_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_WRHDR_ERR_EID), @@ -3191,7 +3192,7 @@ void TestTask(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_RUNNING, "CFE_ES", NULL, NULL); UT_SetForceFail(UT_KEY(OS_write), OS_ERROR); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryAll_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryAllCmd), UT_TPID_CFE_ES_CMD_QUERY_ALL_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_TASKWR_ERR_EID), @@ -3203,7 +3204,7 @@ void TestTask(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_RUNNING, "CFE_ES", NULL, NULL); UT_SetForceFail(UT_KEY(OS_OpenCreate), OS_ERROR); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryAll_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryAllCmd), UT_TPID_CFE_ES_CMD_QUERY_ALL_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_OSCREATE_ERR_EID), @@ -3214,7 +3215,7 @@ void TestTask(void) ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_RUNNING, "CFE_ES", NULL, NULL); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryAllTasks_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryAllTasksCmd), UT_TPID_CFE_ES_CMD_QUERY_ALL_TASKS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_TASKINFO_EID), @@ -3227,7 +3228,7 @@ void TestTask(void) strncpy((char *) CmdBuf.QueryAllTasksCmd.Payload.FileName, "filename", sizeof(CmdBuf.QueryAllTasksCmd.Payload.FileName)); UT_SetDeferredRetcode(UT_KEY(CFE_FS_WriteHeader), 1, -1); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryAllTasks_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryAllTasksCmd), UT_TPID_CFE_ES_CMD_QUERY_ALL_TASKS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_TASKINFO_WRHDR_ERR_EID), @@ -3239,7 +3240,7 @@ void TestTask(void) ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_RUNNING, "UT", NULL, NULL); memset(&CmdBuf, 0, sizeof(CmdBuf)); UT_SetForceFail(UT_KEY(OS_write), OS_ERROR); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryAllTasks_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryAllTasksCmd), UT_TPID_CFE_ES_CMD_QUERY_ALL_TASKS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_TASKINFO_WR_ERR_EID), @@ -3250,7 +3251,7 @@ void TestTask(void) ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); UT_SetForceFail(UT_KEY(OS_OpenCreate), OS_ERROR); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryAllTasks_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryAllTasksCmd), UT_TPID_CFE_ES_CMD_QUERY_ALL_TASKS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_TASKINFO_OSCREATE_ERR_EID), @@ -3260,70 +3261,70 @@ void TestTask(void) /* Test successful clearing of the system log */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_ClearSyslog_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.ClearSysLogCmd), UT_TPID_CFE_ES_CMD_CLEAR_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_SYSLOG1_INF_EID), - "CFE_ES_ClearSyslogCmd", + "CFE_ES_ClearSysLogCmd", "Clear ES log data"); /* Test successful overwriting of the system log using discard mode */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); CmdBuf.OverwriteSysLogCmd.Payload.Mode = CFE_ES_LogMode_OVERWRITE; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_OverWriteSyslog_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.OverwriteSysLogCmd), UT_TPID_CFE_ES_CMD_OVER_WRITE_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_SYSLOGMODE_EID), - "CFE_ES_OverWriteSyslogCmd", + "CFE_ES_OverWriteSysLogCmd", "Overwrite system log received (discard mode)"); /* Test overwriting the system log using an invalid mode */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); CmdBuf.OverwriteSysLogCmd.Payload.Mode = 255; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_OverWriteSyslog_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.OverwriteSysLogCmd), UT_TPID_CFE_ES_CMD_OVER_WRITE_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_ERR_SYSLOGMODE_EID), - "CFE_ES_OverWriteSyslogCmd", + "CFE_ES_OverWriteSysLogCmd", "Overwrite system log using invalid mode"); /* Test successful writing of the system log */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); - strncpy((char *) CmdBuf.WriteSyslogCmd.Payload.FileName, "filename", - sizeof(CmdBuf.WriteSyslogCmd.Payload.FileName)); + strncpy((char *) CmdBuf.WriteSysLogCmd.Payload.FileName, "filename", + sizeof(CmdBuf.WriteSysLogCmd.Payload.FileName)); CFE_ES_TaskData.HkPacket.Payload.SysLogEntries = 123; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_WriteSyslog_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.WriteSysLogCmd), UT_TPID_CFE_ES_CMD_WRITE_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_SYSLOG2_EID), - "CFE_ES_WriteSyslogCmd", + "CFE_ES_WriteSysLogCmd", "Write system log; success"); /* Test writing the system log using a null file name */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); - CmdBuf.WriteSyslogCmd.Payload.FileName[0] = '\0'; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_WriteSyslog_t), + CmdBuf.WriteSysLogCmd.Payload.FileName[0] = '\0'; + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.WriteSysLogCmd), UT_TPID_CFE_ES_CMD_WRITE_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_SYSLOG2_EID), - "CFE_ES_WriteSyslogCmd", + "CFE_ES_WriteSysLogCmd", "Write system log; null file name"); /* Test writing the system log with an OS create failure */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); UT_SetForceFail(UT_KEY(OS_OpenCreate), OS_ERROR); - strncpy((char *) CmdBuf.WriteSyslogCmd.Payload.FileName, "", - sizeof(CmdBuf.WriteSyslogCmd.Payload.FileName)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_WriteSyslog_t), + strncpy((char *) CmdBuf.WriteSysLogCmd.Payload.FileName, "", + sizeof(CmdBuf.WriteSysLogCmd.Payload.FileName)); + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.WriteSysLogCmd), UT_TPID_CFE_ES_CMD_WRITE_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_SYSLOG2_ERR_EID), - "CFE_ES_WriteSyslogCmd", + "CFE_ES_WriteSysLogCmd", "Write system log; OS create"); /* Test writing the system log with an OS write failure */ @@ -3334,29 +3335,29 @@ void TestTask(void) sizeof(CFE_ES_ResetDataPtr->SystemLog), "0000-000-00:00:00.00000 Test Message\n"); CFE_ES_ResetDataPtr->SystemLogEndIdx = CFE_ES_ResetDataPtr->SystemLogWriteIdx; - strncpy((char *) CmdBuf.WriteSyslogCmd.Payload.FileName, "", - sizeof(CmdBuf.WriteSyslogCmd.Payload.FileName)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_WriteSyslog_t), + strncpy((char *) CmdBuf.WriteSysLogCmd.Payload.FileName, "", + sizeof(CmdBuf.WriteSysLogCmd.Payload.FileName)); + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.WriteSysLogCmd), UT_TPID_CFE_ES_CMD_WRITE_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_FILEWRITE_ERR_EID), - "CFE_ES_WriteSyslogCmd", + "CFE_ES_WriteSysLogCmd", "Write system log; OS write"); /* Test writing the system log with a write header failure */ ES_ResetUnitTest(); UT_SetDeferredRetcode(UT_KEY(CFE_FS_WriteHeader), 1, OS_ERROR); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_WriteSyslog_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.WriteSysLogCmd), UT_TPID_CFE_ES_CMD_WRITE_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_FILEWRITE_ERR_EID), - "CFE_ES_WriteSyslogCmd", + "CFE_ES_WriteSysLogCmd", "Write system log; write header"); /* Test successful clearing of the E&R log */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_ClearERLog_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.ClearERLogCmd), UT_TPID_CFE_ES_CMD_CLEAR_ER_LOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_ERLOG1_INF_EID), @@ -3368,10 +3369,10 @@ void TestTask(void) * this just sets a flag for the background task */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); - strncpy(CmdBuf.WriteERlogCmd.Payload.FileName, "filename", - sizeof(CmdBuf.WriteERlogCmd.Payload.FileName)); + strncpy(CmdBuf.WriteERLogCmd.Payload.FileName, "filename", + sizeof(CmdBuf.WriteERLogCmd.Payload.FileName)); CFE_ES_TaskData.BackgroundERLogDumpState.IsPending = false; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_WriteERLog_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.WriteERLogCmd), UT_TPID_CFE_ES_CMD_WRITE_ER_LOG_CC); UT_Report(__FILE__, __LINE__, CFE_ES_TaskData.BackgroundERLogDumpState.IsPending, @@ -3384,7 +3385,7 @@ void TestTask(void) /* sending the same command a second time should fail with an event * indicating a file write is already pending. */ - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_WriteERLog_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.WriteERLogCmd), UT_TPID_CFE_ES_CMD_WRITE_ER_LOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_ERLOG_PENDING_ERR_EID), @@ -3531,7 +3532,7 @@ void TestTask(void) /* Test resetting and setting the max for the processor reset count */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_ResetPRCount_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.ResetPRCountCmd), UT_TPID_CFE_ES_CMD_RESET_PR_COUNT_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_RESET_PR_COUNT_EID), @@ -3542,7 +3543,7 @@ void TestTask(void) ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); CmdBuf.SetMaxPRCountCmd.Payload.MaxPRCount = 3; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_SetMaxPRCount_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.SetMaxPRCountCmd), UT_TPID_CFE_ES_CMD_SET_MAX_PR_COUNT_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_SET_MAX_PR_COUNT_EID), @@ -3557,7 +3558,7 @@ void TestTask(void) strncpy(CmdBuf.DeleteCDSCmd.Payload.CdsName, "CFE_ES.CDS_NAME", sizeof(CmdBuf.DeleteCDSCmd.Payload.CdsName)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_DeleteCDS_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.DeleteCDSCmd), UT_TPID_CFE_ES_CMD_DELETE_CDS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_CDS_DELETE_ERR_EID), @@ -3568,7 +3569,7 @@ void TestTask(void) /* NOTE - reuse command from previous test */ ES_ResetUnitTest(); ES_UT_SetupSingleCDSRegistry("CFE_ES.CDS_NAME", ES_UT_CDS_BLOCK_SIZE, true, NULL); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_DeleteCDS_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.DeleteCDSCmd), UT_TPID_CFE_ES_CMD_DELETE_CDS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_CDS_DELETE_TBL_ERR_EID), @@ -3581,7 +3582,7 @@ void TestTask(void) ES_UT_SetupSingleCDSRegistry("CFE_ES.CDS_NAME", ES_UT_CDS_BLOCK_SIZE, false, NULL); /* Set up the block to read what we need to from the CDS */ - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_DeleteCDS_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.DeleteCDSCmd), UT_TPID_CFE_ES_CMD_DELETE_CDS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_CDS_DELETED_INFO_EID), @@ -3592,7 +3593,7 @@ void TestTask(void) ES_ResetUnitTest(); ES_UT_SetupSingleCDSRegistry("CFE_ES.CDS_NAME", ES_UT_CDS_BLOCK_SIZE, false, NULL); ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_RUNNING, "CFE_ES", NULL, NULL); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_DeleteCDS_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.DeleteCDSCmd), UT_TPID_CFE_ES_CMD_DELETE_CDS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_CDS_OWNER_ACTIVE_EID), @@ -3604,7 +3605,7 @@ void TestTask(void) ES_UT_SetupSingleCDSRegistry("CFE_ES.CDS_NAME", ES_UT_CDS_BLOCK_SIZE, false, &UtCDSRegRecPtr); ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_RUNNING, "CFE_BAD", NULL, NULL); CFE_ES_CDSBlockRecordSetFree(UtCDSRegRecPtr); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_DeleteCDS_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.DeleteCDSCmd), UT_TPID_CFE_ES_CMD_DELETE_CDS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_CDS_NAME_ERR_EID), @@ -3614,7 +3615,7 @@ void TestTask(void) /* Test successful dump of CDS to file using the default dump file name */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_DumpCDSRegistry_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.DumpCDSRegistryCmd), UT_TPID_CFE_ES_CMD_DUMP_CDS_REGISTRY_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_CDS_REG_DUMP_INF_EID), @@ -3625,7 +3626,7 @@ void TestTask(void) ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); UT_SetDeferredRetcode(UT_KEY(CFE_FS_WriteHeader), 1, -1); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_DumpCDSRegistry_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.DumpCDSRegistryCmd), UT_TPID_CFE_ES_CMD_DUMP_CDS_REGISTRY_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_WRITE_CFE_HDR_ERR_EID), @@ -3636,7 +3637,7 @@ void TestTask(void) ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); UT_SetForceFail(UT_KEY(OS_OpenCreate), OS_ERROR); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_DumpCDSRegistry_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.DumpCDSRegistryCmd), UT_TPID_CFE_ES_CMD_DUMP_CDS_REGISTRY_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_CREATING_CDS_DUMP_ERR_EID), @@ -3648,7 +3649,7 @@ void TestTask(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); UT_SetForceFail(UT_KEY(OS_write), OS_ERROR); ES_UT_SetupSingleCDSRegistry("CFE_ES.CDS_NAME", ES_UT_CDS_BLOCK_SIZE, false, NULL); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_DumpCDSRegistry_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.DumpCDSRegistryCmd), UT_TPID_CFE_ES_CMD_DUMP_CDS_REGISTRY_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_CDS_DUMP_ERR_EID), @@ -3658,7 +3659,7 @@ void TestTask(void) /* Test telemetry pool statistics retrieval with an invalid handle */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_SendMemPoolStats_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.SendMemPoolStatsCmd), UT_TPID_CFE_ES_CMD_SEND_MEM_POOL_STATS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_INVALID_POOL_HANDLE_ERR_EID), @@ -3668,8 +3669,8 @@ void TestTask(void) /* Test successful telemetry pool statistics retrieval */ ES_ResetUnitTest(); ES_UT_SetupMemPoolId(&UtPoolRecPtr); - CmdBuf.TlmPoolStatsCmd.Payload.PoolHandle = CFE_ES_MemPoolRecordGetID(UtPoolRecPtr); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_SendMemPoolStats_t), + CmdBuf.SendMemPoolStatsCmd.Payload.PoolHandle = CFE_ES_MemPoolRecordGetID(UtPoolRecPtr); + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.SendMemPoolStatsCmd), UT_TPID_CFE_ES_CMD_SEND_MEM_POOL_STATS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_TLM_POOL_STATS_INFO_EID), @@ -3716,7 +3717,7 @@ void TestTask(void) ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); CmdBuf.RestartCmd.Payload.RestartType = CFE_PSP_RST_TYPE_POWERON; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_Restart_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.RestartCmd), UT_TPID_CFE_ES_CMD_RESTART_CC); UT_Report(__FILE__, __LINE__, !UT_EventIsInHistory(CFE_ES_BOOT_ERR_EID), @@ -3748,7 +3749,7 @@ void TestTask(void) CmdBuf.StartAppCmd.Payload.ExceptionAction = CFE_ES_ExceptionAction_PROC_RESTART; CmdBuf.StartAppCmd.Payload.Priority = 160; CmdBuf.StartAppCmd.Payload.StackSize = CFE_ES_MEMOFFSET_C(CFE_PLATFORM_ES_DEFAULT_STACK_SIZE); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_StartApp_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.StartAppCmd), UT_TPID_CFE_ES_CMD_START_APP_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_START_INF_EID), @@ -3814,7 +3815,7 @@ void TestTask(void) ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); UT_SetDeferredRetcode(UT_KEY(OS_OpenCreate), 1, OS_ERROR); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryAll_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryAllCmd), UT_TPID_CFE_ES_CMD_QUERY_ALL_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_ALL_APPS_EID), @@ -3836,7 +3837,7 @@ void TestTask(void) ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); UT_SetDeferredRetcode(UT_KEY(OS_OpenCreate), 1, OS_ERROR); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_QueryAllTasks_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.QueryAllTasksCmd), UT_TPID_CFE_ES_CMD_QUERY_ALL_TASKS_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_TASKINFO_EID), @@ -3851,7 +3852,7 @@ void TestTask(void) UT_TPID_CFE_ES_CMD_CLEAR_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_LEN_ERR_EID), - "CFE_ES_ClearSyslogCmd", + "CFE_ES_ClearSysLogCmd", "Clear system log command; invalid command length"); /* Test sending a request to overwrite the system log with an @@ -3862,7 +3863,7 @@ void TestTask(void) UT_TPID_CFE_ES_CMD_OVER_WRITE_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_LEN_ERR_EID), - "CFE_ES_OverwriteSyslogCmd", + "CFE_ES_OverwriteSysLogCmd", "Overwrite system log command; invalid command length"); /* Test sending a request to write the system log with an @@ -3873,18 +3874,18 @@ void TestTask(void) UT_TPID_CFE_ES_CMD_WRITE_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_LEN_ERR_EID), - "CFE_ES_WriteSyslogCmd", + "CFE_ES_WriteSysLogCmd", "Write system log command; invalid command length"); /* Test successful overwriting of the system log using overwrite mode */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); CmdBuf.OverwriteSysLogCmd.Payload.Mode = CFE_ES_LogMode_OVERWRITE; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_OverWriteSyslog_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.OverwriteSysLogCmd), UT_TPID_CFE_ES_CMD_OVER_WRITE_SYSLOG_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_SYSLOGMODE_EID), - "CFE_ES_OverWriteSyslogCmd", + "CFE_ES_OverWriteSysLogCmd", "Overwrite system log received (overwrite mode)"); /* Test sending a request to write the error log with an @@ -3948,9 +3949,9 @@ void TestTask(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); ES_UT_SetupSingleAppId(CFE_ES_AppType_CORE, CFE_ES_AppState_RUNNING, "CFE_ES", NULL, NULL); ES_UT_SetupSingleCDSRegistry("CFE_ES.CDS_NAME", ES_UT_CDS_BLOCK_SIZE, false, NULL); - strncpy(CmdBuf.DumpCDSRegCmd.Payload.DumpFilename, "DumpFile", - sizeof(CmdBuf.DumpCDSRegCmd.Payload.DumpFilename)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_DumpCDSRegistry_t), + strncpy(CmdBuf.DumpCDSRegistryCmd.Payload.DumpFilename, "DumpFile", + sizeof(CmdBuf.DumpCDSRegistryCmd.Payload.DumpFilename)); + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.DumpCDSRegistryCmd), UT_TPID_CFE_ES_CMD_DUMP_CDS_REGISTRY_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_CDS_REG_DUMP_INF_EID), @@ -3962,11 +3963,11 @@ void TestPerf(void) { union { - CFE_MSG_Message_t Msg; - CFE_ES_StartPerfData_t PerfStartCmd; - CFE_ES_StopPerfData_t PerfStopCmd; - CFE_ES_SetPerfFilterMask_t PerfSetFilterMaskCmd; - CFE_ES_SetPerfTriggerMask_t PerfSetTrigMaskCmd; + CFE_MSG_Message_t Msg; + CFE_ES_StartPerfDataCmd_t PerfStartCmd; + CFE_ES_StopPerfDataCmd_t PerfStopCmd; + CFE_ES_SetPerfFilterMaskCmd_t PerfSetFilterMaskCmd; + CFE_ES_SetPerfTriggerMaskCmd_t PerfSetTrigMaskCmd; } CmdBuf; UtPrintf("Begin Test Performance Log"); @@ -4120,7 +4121,7 @@ void TestPerf(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); CmdBuf.PerfSetFilterMaskCmd.Payload.FilterMaskNum = CFE_ES_PERF_32BIT_WORDS_IN_MASK; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_SetPerfFilterMask_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.PerfSetFilterMaskCmd), UT_TPID_CFE_ES_CMD_SET_PERF_FILTER_MASK_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_PERF_FILTMSKERR_EID), @@ -4132,7 +4133,7 @@ void TestPerf(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); CmdBuf.PerfSetFilterMaskCmd.Payload.FilterMaskNum = CFE_ES_PERF_32BIT_WORDS_IN_MASK / 2; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_SetPerfFilterMask_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.PerfSetFilterMaskCmd), UT_TPID_CFE_ES_CMD_SET_PERF_FILTER_MASK_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_PERF_FILTMSKCMD_EID), @@ -4144,7 +4145,7 @@ void TestPerf(void) ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); CmdBuf.PerfSetTrigMaskCmd.Payload.TriggerMaskNum = 0; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_SetPerfTriggerMask_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.PerfSetTrigMaskCmd), UT_TPID_CFE_ES_CMD_SET_PERF_TRIGGER_MASK_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_PERF_TRIGMSKCMD_EID), @@ -4158,7 +4159,7 @@ void TestPerf(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); CmdBuf.PerfSetTrigMaskCmd.Payload.TriggerMaskNum = CFE_ES_PERF_32BIT_WORDS_IN_MASK - 1; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_SetPerfTriggerMask_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.PerfSetTrigMaskCmd), UT_TPID_CFE_ES_CMD_SET_PERF_TRIGGER_MASK_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_PERF_TRIGMSKCMD_EID), @@ -4172,7 +4173,7 @@ void TestPerf(void) memset(&CmdBuf, 0, sizeof(CmdBuf)); CmdBuf.PerfSetTrigMaskCmd.Payload.TriggerMaskNum = CFE_ES_PERF_32BIT_WORDS_IN_MASK + 1; - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_SetPerfTriggerMask_t), + UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CmdBuf.PerfSetTrigMaskCmd), UT_TPID_CFE_ES_CMD_SET_PERF_TRIGGER_MASK_CC); UT_Report(__FILE__, __LINE__, UT_EventIsInHistory(CFE_ES_PERF_TRIGMSKERR_EID), diff --git a/fsw/cfe-core/unit-test/es_UT.h b/fsw/cfe-core/unit-test/es_UT.h index c33b5546c..307d59841 100644 --- a/fsw/cfe-core/unit-test/es_UT.h +++ b/fsw/cfe-core/unit-test/es_UT.h @@ -82,12 +82,6 @@ ** ** \returns ** This function does not return a value. -** -** \sa #UT_Init, #UT_SetCDSSize, #UT_SetSizeofESResetArea -** \sa #UT_SetStatusBSPResetArea, #UT_SetReadBuffer, #UT_SetRtnCode -** \sa #UT_SetDummyFuncRtn, #UT_SetBSPloadAppFileResult, #CFE_ES_Main -** \sa #UT_Report -** ******************************************************************************/ void TestInit(void); @@ -108,12 +102,6 @@ void TestInit(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_SetRtnCode, #UT_SetOSFail, #CFE_ES_Main, #UT_Report -** \sa #CFE_ES_SetupResetVariables, #UT_SetStatusBSPResetArea -** \sa #UT_SetSizeofESResetArea, #CFE_ES_InitializeFileSystems, #UT_SetBSPFail -** \sa #CFE_ES_CreateObjects -** ******************************************************************************/ void TestStartupErrorPaths(void); @@ -132,14 +120,6 @@ void TestStartupErrorPaths(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_SetReadBuffer, #UT_SetRtnCode, #CFE_ES_StartApplications -** \sa #UT_Report, #UT_SetOSFail, #CFE_ES_ParseFileEntry -** \sa #UT_SetBSPloadAppFileResult, #CFE_ES_AppCreate, #UT_SetDummyFuncRtn -** \sa #CFE_ES_LoadLibrary, #CFE_ES_ScanAppTable, #CFE_ES_ProcessControlRequest -** \sa #CFE_ES_GetAppInfo, #CFE_ES_CleanUpApp -** \sa #CFE_ES_CleanupTaskResources -** ******************************************************************************/ void TestApps(void); @@ -158,9 +138,6 @@ void TestApps(void); ** ** \returns ** This function does not return a value. -** -** \sa #CFE_ES_WriteToERLog, #UT_Report -** ******************************************************************************/ void TestERLog(void); @@ -178,19 +155,6 @@ void TestERLog(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_SetRtnCode, #CFE_ES_TaskMain, #UT_Report, #UT_SetOSFail -** \sa #CFE_ES_TaskInit, #UT_SetSBTotalMsgLen, #UT_SendMsg -** \sa #UT_SetBSPloadAppFileResult, #UT_SetStatusBSPResetArea -** \sa #CFE_ES_HousekeepingCmd, #CFE_ES_NoopCmd, #CFE_ES_ResetCountersCmd -** \sa #CFE_ES_RestartCmd, #CFE_ES_StartAppCmd -** \sa #CFE_ES_StopAppCmd, #CFE_ES_RestartAppCmd, #CFE_ES_ReloadAppCmd -** \sa #CFE_ES_QueryOneCmd, #CFE_ES_QueryAllCmd, #CFE_ES_QueryAllTasksCmd -** \sa #CFE_ES_ClearSyslogCmd, #CFE_ES_OverWriteSyslogCmd -** \sa #CFE_ES_WriteSyslogCmd, #CFE_ES_ClearERLogCmd, #CFE_ES_WriteERLogCmd -** \sa #CFE_ES_ResetPRCountCmd, #CFE_ES_SetMaxPRCountCmd, #CFE_ES_DeleteCDSCmd -** \sa #CFE_ES_DumpCDSRegistryCmd, #CFE_ES_SendMemPoolStatsCmd, #CFE_ES_TaskPipe -** ******************************************************************************/ void TestTask(void); @@ -207,7 +171,6 @@ void TestTask(void); ** ** \returns ** This function does not return a value. -** ******************************************************************************/ void TestBackground(void); @@ -224,13 +187,6 @@ void TestBackground(void); ** ** \returns ** This function does not return a value. -** -** \sa #CFE_ES_SetupPerfVariables, #UT_Report, #UT_SetRtnCode -** \sa #UT_SetSBTotalMsgLen, #UT_SendMsg, #UT_SetBSPloadAppFileResult -** \sa #CFE_ES_PerfLogDump, #CFE_ES_PerfLogAdd, #CFE_ES_StartPerfDataCmd -** \sa #CFE_ES_StopPerfDataCmd, #CFE_ES_SetPerfFilterMaskCmd -** \sa #CFE_ES_SetPerfTriggerMaskCmd, #CFE_ES_PerfLogDump, #CFE_ES_PerfLogAdd -** ******************************************************************************/ void TestPerf(void); @@ -246,20 +202,6 @@ void TestPerf(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_SetRtnCode, #CFE_ES_ResetCFE, #UT_Report -** \sa #CFE_ES_GetResetType, #CFE_ES_RestartApp, #CFE_ES_ReloadApp -** \sa #CFE_ES_DeleteApp, #CFE_ES_ExitApp, #CFE_ES_RunLoop -** \sa #CFE_ES_RegisterApp, #CFE_ES_GetAppID, #CFE_ES_GetAppName -** \sa #CFE_ES_GetTaskInfo, #CFE_ES_CreateChildTask, #CFE_ES_DeleteChildTask -** \sa #CFE_ES_ExitChildTask, #CFE_ES_RegisterChildTask, #CFE_ES_WriteToSysLog -** \sa #CFE_ES_CalculateCRC, #CFE_ES_WaitForStartupSync, #CFE_ES_ProcessCoreException -** \sa #UT_SetBSPFail, #CFE_ES_RegisterCDS, #CFE_ES_CopyToCDS -** \sa #CFE_ES_RestoreFromCDS, #CFE_ES_LockSharedData, #CFE_ES_UnlockSharedData -** \sa #CFE_ES_RegisterGenCounter, #CFE_ES_GetGenCounterIDByName -** \sa #CFE_ES_DeleteGenCounter, #CFE_ES_IncrementGenCounter -** \sa #CFE_ES_GetGenCount, #CFE_ES_SetGenCount -** ******************************************************************************/ void TestAPI(void); @@ -276,13 +218,6 @@ void TestAPI(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_ES_CDS_ValidateAppID -** \sa #UT_SetBSPFail, #CFE_ES_RebuildCDS, #UT_SetRtnCode -** \sa #CFE_ES_InitCDSRegistry, #UT_SetCDSSize, #CFE_ES_CDS_EarlyInit -** \sa #UT_SetCDSBSPCheckValidity, #CFE_ES_ValidateCDS, #UT_SetCDSReadGoodEnd -** \sa #CFE_ES_InitCDSSignatures, #CFE_ES_RebuildCDS, #CFE_ES_DeleteCDS -** ******************************************************************************/ void TestCDS(void); @@ -300,12 +235,6 @@ void TestCDS(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_ES_CreateCDSPool -** \sa #CFE_ES_RebuildCDSPool, #UT_SetRtnCode, #UT_SetBSPFail -** \sa #CFE_ES_GetCDSBlock, #CFE_ES_PutCDSBlock, #CFE_ES_CDSBlockWrite -** \sa #CFE_ES_CDSBlockRead -** ******************************************************************************/ void TestCDSMempool(void); @@ -323,12 +252,6 @@ void TestCDSMempool(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_ES_PoolCreateNoSem -** \sa #CFE_ES_PoolCreate, #CFE_ES_GetPoolBuf, #CFE_ES_GetPoolBufInfo -** \sa #CFE_ES_PutPoolBuf, #CFE_ES_ValidateHandle, #UT_SetRtnCode -** \sa #CFE_ES_GetMemPoolStats, #CFE_ES_PoolCreateEx, #CFE_ES_PoolCreateNoSem -** ******************************************************************************/ void TestESMempool(void); diff --git a/fsw/cfe-core/unit-test/evs_UT.c b/fsw/cfe-core/unit-test/evs_UT.c index 3290158e4..5ec42992a 100644 --- a/fsw/cfe-core/unit-test/evs_UT.c +++ b/fsw/cfe-core/unit-test/evs_UT.c @@ -231,12 +231,12 @@ static void UT_EVS_DoDispatchCheckEvents_Impl(void *MsgPtr, uint32 MsgSize, EventCapture->EventID = 0xFFFF; SnapshotData.SnapshotBuffer = &EventCapture->EventID; - UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &SnapshotData); + UT_SetHookFunction(UT_KEY(CFE_SB_TransmitMsg), UT_SoftwareBusSnapshotHook, &SnapshotData); UT_CallTaskPipe(CFE_EVS_ProcessCommandPacket, (CFE_MSG_Message_t *)MsgPtr, MsgSize, DispatchId); EventCapture->Count += SnapshotData.Count; /* be sure to clear the hook function since the SnapshotData is going out of scope */ - UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), NULL, NULL); + UT_SetHookFunction(UT_KEY(CFE_SB_TransmitMsg), NULL, NULL); } static void UT_EVS_DoDispatchCheckEvents(void *MsgPtr, uint32 MsgSize, @@ -258,12 +258,12 @@ static void UT_EVS_DoGenericCheckEvents(void (*Func)(void), UT_EVS_EventCapture_ EventCapture->EventID = -1; SnapshotData.SnapshotBuffer = &EventCapture->EventID; - UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &SnapshotData); + UT_SetHookFunction(UT_KEY(CFE_SB_TransmitMsg), UT_SoftwareBusSnapshotHook, &SnapshotData); Func(); EventCapture->Count += SnapshotData.Count; /* be sure to clear the hook function since the SnapshotData is going out of scope */ - UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), NULL, NULL); + UT_SetHookFunction(UT_KEY(CFE_SB_TransmitMsg), NULL, NULL); } /* @@ -910,7 +910,7 @@ void Test_Format(void) int16 EventID[2]; CFE_TIME_SysTime_t time = {0, 0}; - CFE_EVS_SetEventFormatMode_t modecmd; + CFE_EVS_SetEventFormatModeCmd_t modecmd; CFE_EVS_AppNameBitMaskCmd_t appbitcmd; CFE_EVS_PacketID_t CapturedMsg; UT_SoftwareBusSnapshot_Entry_t LongFmtSnapshotData = @@ -981,12 +981,12 @@ void Test_Format(void) UtPrintf("Test for short event sent when configured to do so "); UT_InitData(); UT_SetHookFunction(UT_KEY(CFE_MSG_Init), UT_EVS_MSGInitHook, &MsgData); - UT_SetDataBuffer(UT_KEY(CFE_SB_SendMsg), &MsgSend, sizeof(MsgSend), false); + UT_SetDataBuffer(UT_KEY(CFE_SB_TransmitMsg), &MsgSend, sizeof(MsgSend), false); CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "Short format check 1"); /* Note implementation initializes both short and long message */ ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_MSG_Init)), 2); - ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_SB_SendMsg)), 1); + ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_SB_TransmitMsg)), 1); ASSERT_TRUE(CFE_SB_MsgId_Equal(MsgData.MsgId, ShortFmtSnapshotData.MsgId)); ASSERT_TRUE(!CFE_SB_MsgId_Equal(MsgData.MsgId, LongFmtSnapshotData.MsgId)); @@ -1011,7 +1011,7 @@ void Test_Format(void) */ UT_InitData(); memset(&CapturedMsg, 0xFF, sizeof(CapturedMsg)); - UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &LongFmtSnapshotData); + UT_SetHookFunction(UT_KEY(CFE_SB_TransmitMsg), UT_SoftwareBusSnapshotHook, &LongFmtSnapshotData); CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "Long format check (SendEvent)"); EventID[0] = CapturedMsg.EventID; memset(&CapturedMsg, 0xFF, sizeof(CapturedMsg)); @@ -1098,7 +1098,7 @@ void Test_Ports(void) /* Test that ports are enabled by sending a message */ UT_InitData(); - UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &LocalSnapshotData); + UT_SetHookFunction(UT_KEY(CFE_SB_TransmitMsg), UT_SoftwareBusSnapshotHook, &LocalSnapshotData); CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "Test ports message"); UT_Report(__FILE__, __LINE__, LocalSnapshotData.Count == 1 && @@ -1216,9 +1216,9 @@ void Test_Logging(void) char tmpString[100]; union { - CFE_EVS_NoArgsCmd_t cmd; - CFE_EVS_SetLogMode_t modecmd; - CFE_EVS_WriteLogDataFile_t logfilecmd; + CFE_EVS_NoArgsCmd_t cmd; + CFE_EVS_SetLogModeCmd_t modecmd; + CFE_EVS_WriteLogDataFileCmd_t logfilecmd; } CmdBuf; cpuaddr TempAddr; CFE_ES_ResetData_t *CFE_EVS_ResetDataPtr; @@ -1432,9 +1432,9 @@ void Test_WriteApp(void) { union { - CFE_EVS_NoArgsCmd_t cmd; - CFE_EVS_WriteAppDataFile_t AppDataCmd; - CFE_EVS_AppNameBitMaskCmd_t appbitcmd; + CFE_EVS_NoArgsCmd_t cmd; + CFE_EVS_WriteAppDataFileCmd_t AppDataCmd; + CFE_EVS_AppNameBitMaskCmd_t appbitcmd; } CmdBuf; UtPrintf("Begin Test Write App"); @@ -1964,7 +1964,7 @@ void Test_EventCmd(void) &UT_EVS_EventBuf); LocalSnapshotData.Count = 0; - UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &LocalSnapshotData); + UT_SetHookFunction(UT_KEY(CFE_SB_TransmitMsg), UT_SoftwareBusSnapshotHook, &LocalSnapshotData); CFE_EVS_SendEvent(0, CFE_EVS_EventType_DEBUG, "FAIL : Debug message disabled"); EventCount[0] = LocalSnapshotData.Count; CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "FAIL : Info message disabled"); @@ -1986,7 +1986,7 @@ void Test_EventCmd(void) UT_EVS_DoDispatchCheckEvents(&appbitcmd, sizeof(appbitcmd), UT_TPID_CFE_EVS_CMD_ENABLE_APP_EVENT_TYPE_CC, &UT_EVS_EventBuf); - UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &LocalSnapshotData); + UT_SetHookFunction(UT_KEY(CFE_SB_TransmitMsg), UT_SoftwareBusSnapshotHook, &LocalSnapshotData); CFE_EVS_SendEvent(0, CFE_EVS_EventType_DEBUG, "Debug message enabled"); EventCount[0] = LocalSnapshotData.Count; CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "Info message enabled"); @@ -2666,8 +2666,8 @@ void Test_Misc(void) { CFE_MSG_Message_t msg; CFE_EVS_NoArgsCmd_t cmd; - CFE_EVS_SetLogMode_t modecmd; - CFE_EVS_WriteLogDataFile_t writelogdatacmd; + CFE_EVS_SetLogModeCmd_t modecmd; + CFE_EVS_WriteLogDataFileCmd_t writelogdatacmd; } PktBuf; CFE_ES_ResourceID_t AppID; @@ -2711,7 +2711,7 @@ void Test_Misc(void) UT_InitData(); CFE_EVS_GlobalData.EVS_TlmPkt.Payload.LogEnabled = true; HK_SnapshotData.Count = 0; - UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &HK_SnapshotData); + UT_SetHookFunction(UT_KEY(CFE_SB_TransmitMsg), UT_SoftwareBusSnapshotHook, &HK_SnapshotData); UT_CallTaskPipe(CFE_EVS_ProcessCommandPacket, &PktBuf.msg, sizeof(PktBuf.cmd), UT_TPID_CFE_EVS_SEND_HK); UT_Report(__FILE__, __LINE__, @@ -2737,7 +2737,7 @@ void Test_Misc(void) UT_InitData(); CFE_EVS_GlobalData.EVS_TlmPkt.Payload.LogEnabled = false; HK_SnapshotData.Count = 0; - UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &HK_SnapshotData); + UT_SetHookFunction(UT_KEY(CFE_SB_TransmitMsg), UT_SoftwareBusSnapshotHook, &HK_SnapshotData); UT_CallTaskPipe(CFE_EVS_ProcessCommandPacket, &PktBuf.msg, sizeof(PktBuf.cmd), UT_TPID_CFE_EVS_SEND_HK); UT_Report(__FILE__, __LINE__, diff --git a/fsw/cfe-core/unit-test/evs_UT.h b/fsw/cfe-core/unit-test/evs_UT.h index 8f14832bf..60279984f 100644 --- a/fsw/cfe-core/unit-test/evs_UT.h +++ b/fsw/cfe-core/unit-test/evs_UT.h @@ -70,12 +70,6 @@ ** ** \returns ** This function does not return a value. -** -** \sa UT_InitData, #UT_SetSizeofESResetArea, #UT_SetRtnCode -** \sa #CFE_EVS_EarlyInit, #UT_Report, #CFE_EVS_TaskMain -** \sa #UT_SetStatusBSPResetArea, #UT_SetAppID, #UT_SendMsg -** \sa #UT_SetSBTotalMsgLen -** ******************************************************************************/ void Test_Init(void); @@ -91,12 +85,6 @@ void Test_Init(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetAppID, #UT_Report, #CFE_EVS_Register -** \sa #CFE_EVS_SendEvent, #CFE_EVS_SendTimedEvent, #CFE_EVS_SendEventWithAppID -** \sa #CFE_EVS_ResetFilter, #CFE_EVS_ResetAllFilters, #CFE_EVS_CleanUpApp -** \sa #CFE_EVS_EnableAppEventTypesCmd, #CFE_EVS_DisablePortsCmd -** ******************************************************************************/ void Test_IllegalAppID(void); @@ -112,12 +100,6 @@ void Test_IllegalAppID(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_EVS_Unregister, #UT_Report -** \sa #CFE_EVS_SendEvent, #CFE_EVS_ResetFilter, #CFE_EVS_ResetAllFilters -** \sa #CFE_EVS_SendEventWithAppID, #CFE_EVS_SendTimedEvent -** \sa #CFE_EVS_CleanUpApp, #CFE_EVS_Register -** ******************************************************************************/ void Test_UnregisteredApp(void); @@ -133,11 +115,6 @@ void Test_UnregisteredApp(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_EVS_Register -** \sa #UT_SetPutPoolFail, #UT_SetRtnCode, #CFE_EVS_Unregister -** \sa #CFE_EVS_SendEvent, #CFE_ES_GetAppID -** ******************************************************************************/ void Test_FilterRegistration(void); @@ -153,10 +130,6 @@ void Test_FilterRegistration(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_EVS_Register -** \sa #CFE_EVS_ResetFilter, #CFE_EVS_ResetAllFilters -** ******************************************************************************/ void Test_FilterReset(void); @@ -174,12 +147,6 @@ void Test_FilterReset(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetSBTotalMsgLen, #UT_SendMsg, #UT_Report -** \sa #CFE_EVS_SendEvent, #UT_SetRtnCode, #CFE_EVS_SendTimedEvent -** \sa #CFE_EVS_SendEventWithAppID, #CFE_EVS_EnableAppEventTypesCmd -** \sa #CFE_EVS_SetEventFormatModeCmd -** ******************************************************************************/ void Test_Format(void); @@ -195,11 +162,6 @@ void Test_Format(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetRtnCode, #UT_SetSBTotalMsgLen -** \sa #UT_SendMsg, #UT_Report, #CFE_EVS_SendEvent, #CFE_EVS_EnablePortsCmd -** \sa #CFE_EVS_DisablePortsCmd -** ******************************************************************************/ void Test_Ports(void); @@ -215,13 +177,6 @@ void Test_Ports(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetSBTotalMsgLen, #UT_SendMsg -** \sa #UT_Report, #UT_SetSizeofESResetArea, #UT_SetRtnCode -** \sa #CFE_PSP_GetResetArea, #CFE_EVS_SendEvent, #UT_SetOSFail -** \sa #CFE_EVS_SetLogModeCmd, #CFE_EVS_WriteLogDataFileCmd, #EVS_ClearLog -** \sa #CFE_EVS_ProcessGroundCommand -** ******************************************************************************/ void Test_Logging(void); @@ -237,11 +192,6 @@ void Test_Logging(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetSBTotalMsgLen, #UT_SendMsg -** \sa #UT_Report, #UT_SetOSFail, #CFE_EVS_EnableAppEventTypesCmd -** \sa #CFE_EVS_ResetCountersCmd, #CFE_EVS_WriteAppDataFileCmd -** ******************************************************************************/ void Test_WriteApp(void); @@ -259,15 +209,6 @@ void Test_WriteApp(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetSBTotalMsgLen, #UT_SendMsg -** \sa #UT_Report, #CFE_EVS_DisableAppEventTypesCmd -** \sa #CFE_EVS_EnableAppEventTypesCmd, #CFE_EVS_EnableAppEventsCmd -** \sa #CFE_EVS_DisableAppEventsCmd, #CFE_EVS_ResetAppEventCounterCmd -** \sa #CFE_EVS_AddEventFilterCmd, #CFE_EVS_DeleteEventFilterCmd -** \sa #CFE_EVS_SetFilterMaskCmd, #CFE_EVS_ResetFilterCmd -** \sa #CFE_EVS_ResetAllFiltersCmd, #CFE_EVS_DisableAppEventTypesCmd -** ******************************************************************************/ void Test_BadAppCmd(void); @@ -283,13 +224,6 @@ void Test_BadAppCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetSBTotalMsgLen, #UT_SendMsg -** \sa #CFE_EVS_SendEvent, #UT_Report, #CFE_EVS_DisableAppEventTypesCmd -** \sa #CFE_EVS_EnableAppEventTypesCmd, #CFE_EVS_DisableAppEventsCmd -** \sa #CFE_EVS_EnableAppEventsCmd, #CFE_EVS_DisableEventTypesCmd -** \sa #CFE_EVS_EnableEventTypesCmd, #CFE_EVS_ResetAppEventCounterCmd -** ******************************************************************************/ void Test_EventCmd(void); @@ -305,13 +239,6 @@ void Test_EventCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetSBTotalMsgLen, #UT_SendMsg -** \sa #UT_Report, #CFE_EVS_Register, #CFE_EVS_EnableAppEventTypesCmd -** \sa #CFE_EVS_DeleteEventFilterCmd, #CFE_EVS_SetFilterMaskCmd -** \sa #CFE_EVS_ResetFilterCmd, #CFE_EVS_ResetAllFiltersCmd -** \sa #CFE_EVS_AddEventFilterCmd -** ******************************************************************************/ void Test_FilterCmd(void); @@ -329,10 +256,6 @@ void Test_FilterCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetSBTotalMsgLen, #UT_SendMsg -** \sa #UT_Report, #CFE_EVS_ProcessGroundCommand, #CFE_EVS_VerifyCmdLength -** ******************************************************************************/ void Test_InvalidCmd(void); @@ -348,12 +271,6 @@ void Test_InvalidCmd(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #EVS_GetApplicationInfo -** \sa #UT_SetSBTotalMsgLen, #UT_SendMsg, #CFE_EVS_CleanUpApp -** \sa #CFE_EVS_Register, #CFE_EVS_WriteLogDataFileCmd, #CFE_EVS_SetLogModeCmd -** \sa #CFE_EVS_ReportHousekeepingCmd -** ******************************************************************************/ void Test_Misc(void); diff --git a/fsw/cfe-core/unit-test/sb_UT.c b/fsw/cfe-core/unit-test/sb_UT.c index f979edb23..f4d78c9dc 100644 --- a/fsw/cfe-core/unit-test/sb_UT.c +++ b/fsw/cfe-core/unit-test/sb_UT.c @@ -141,8 +141,8 @@ void UtTest_Setup(void) Test_GetPipeIdByName_API(); Test_Subscribe_API(); Test_Unsubscribe_API(); - Test_SendMsg_API(); - Test_RcvMsg_API(); + Test_TransmitMsg_API(); + Test_ReceiveBuffer_API(); SB_UT_ADD_SUBTEST(Test_CleanupApp_API); Test_SB_Utils(); @@ -415,16 +415,19 @@ void Test_SB_Cmds(void) */ void Test_SB_Cmds_Noop(void) { - CFE_SB_CmdHdr_t NoParamCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_NoopCmd_t Cmd; + } Noop; CFE_MSG_FcnCode_t FcnCode = CFE_SB_NOOP_CC; CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(NoParamCmd); + CFE_MSG_Size_t Size = sizeof(Noop.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&Noop.SBBuf); EVTCNT(1); @@ -437,16 +440,19 @@ void Test_SB_Cmds_Noop(void) */ void Test_SB_Cmds_RstCtrs(void) { - CFE_SB_CmdHdr_t NoParamCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_ResetCountersCmd_t Cmd; + } ResetCounters; CFE_MSG_FcnCode_t FcnCode = CFE_SB_RESET_COUNTERS_CC; CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(NoParamCmd); + CFE_MSG_Size_t Size = sizeof(ResetCounters.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&ResetCounters.SBBuf); EVTCNT(1); @@ -459,12 +465,16 @@ void Test_SB_Cmds_RstCtrs(void) */ void Test_SB_Cmds_Stats(void) { - CFE_SB_CmdHdr_t NoParamCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_SendSbStatsCmd_t Cmd; + } SendSbStats; CFE_MSG_FcnCode_t FcnCode; CFE_SB_MsgId_t MsgId; CFE_MSG_Size_t Size; - /* For internal SendMsg call */ + /* For internal TransmitMsg call */ MsgId = CFE_SB_ValueToMsgId(CFE_SB_STATS_TLM_MID); Size = sizeof(CFE_SB.StatTlmMsg); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); @@ -472,14 +482,13 @@ void Test_SB_Cmds_Stats(void) /* For Generic command processing */ MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - Size = sizeof(NoParamCmd); + Size = sizeof(SendSbStats.Cmd); FcnCode = CFE_SB_SEND_SB_STATS_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&SendSbStats.SBBuf); /* No subs event and command processing event */ EVTCNT(2); @@ -493,23 +502,25 @@ void Test_SB_Cmds_Stats(void) */ void Test_SB_Cmds_RoutingInfoDef(void) { - CFE_SB_PipeId_t PipeId = 0; - CFE_SB_WriteFileInfoCmd_t WriteFileCmd; - CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_ROUTING_INFO_CC; - CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(WriteFileCmd); + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_SendRoutingInfoCmd_t Cmd; + } SendRoutingInfo; + CFE_SB_PipeId_t PipeId = 0; + CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_ROUTING_INFO_CC; + CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); + CFE_MSG_Size_t Size = sizeof(SendRoutingInfo.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - strncpy((char *)WriteFileCmd.Payload.Filename, "", sizeof(WriteFileCmd.Payload.Filename)); + strncpy((char *)SendRoutingInfo.Cmd.Payload.Filename, "", sizeof(SendRoutingInfo.Cmd.Payload.Filename)); /* Make some routing info by calling CFE_SB_AppInit */ SETUP(CFE_SB_AppInit()); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &WriteFileCmd; - - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&SendRoutingInfo.SBBuf); EVTCNT(12); @@ -530,18 +541,22 @@ void Test_SB_Cmds_RoutingInfoDef(void) */ void Test_SB_Cmds_RoutingInfoSpec(void) { - CFE_SB_WriteFileInfoCmd_t WriteFileCmd; - CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_ROUTING_INFO_CC; - CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(WriteFileCmd); + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_SendRoutingInfoCmd_t Cmd; + } SendRoutingInfo; + CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_ROUTING_INFO_CC; + CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); + CFE_MSG_Size_t Size = sizeof(SendRoutingInfo.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - strncpy((char *)WriteFileCmd.Payload.Filename, "RoutingTstFile", sizeof(WriteFileCmd.Payload.Filename)); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &WriteFileCmd; + strncpy((char *)SendRoutingInfo.Cmd.Payload.Filename, "RoutingTstFile", + sizeof(SendRoutingInfo.Cmd.Payload.Filename)); - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&SendRoutingInfo.SBBuf); EVTCNT(1); @@ -554,21 +569,25 @@ void Test_SB_Cmds_RoutingInfoSpec(void) */ void Test_SB_Cmds_RoutingInfoCreateFail(void) { - CFE_SB_WriteFileInfoCmd_t WriteFileCmd; - CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_ROUTING_INFO_CC; - CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(WriteFileCmd); + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_SendRoutingInfoCmd_t Cmd; + } SendRoutingInfo; + CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_ROUTING_INFO_CC; + CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); + CFE_MSG_Size_t Size = sizeof(SendRoutingInfo.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - strncpy((char *)WriteFileCmd.Payload.Filename, "RoutingTstFile", sizeof(WriteFileCmd.Payload.Filename)); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &WriteFileCmd; + strncpy((char *)SendRoutingInfo.Cmd.Payload.Filename, "RoutingTstFile", + sizeof(SendRoutingInfo.Cmd.Payload.Filename)); /* Make function CFE_SB_SendRtgInfo return CFE_SB_FILE_IO_ERR */ UT_SetForceFail(UT_KEY(OS_OpenCreate), OS_ERROR); - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&SendRoutingInfo.SBBuf); EVTCNT(1); @@ -625,27 +644,30 @@ void Test_SB_Cmds_RoutingInfoWriteFail(void) */ void Test_SB_Cmds_PipeInfoDef(void) { - CFE_SB_WriteFileInfoCmd_t WriteFileCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_SendPipeInfoCmd_t Cmd; + } SendPipeInfo; CFE_SB_PipeId_t PipeId1; CFE_SB_PipeId_t PipeId2; CFE_SB_PipeId_t PipeId3; uint16 PipeDepth = 10; CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_PIPE_INFO_CC; CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(WriteFileCmd); + CFE_MSG_Size_t Size = sizeof(SendPipeInfo.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - strncpy((char *)WriteFileCmd.Payload.Filename, "", sizeof(WriteFileCmd.Payload.Filename)); + strncpy((char *)SendPipeInfo.Cmd.Payload.Filename, "", sizeof(SendPipeInfo.Cmd.Payload.Filename)); /* Create some pipe info */ SETUP(CFE_SB_CreatePipe(&PipeId1, PipeDepth, "TestPipe1")); SETUP(CFE_SB_CreatePipe(&PipeId2, PipeDepth, "TestPipe2")); SETUP(CFE_SB_CreatePipe(&PipeId3, PipeDepth, "TestPipe3")); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &WriteFileCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&SendPipeInfo.SBBuf); EVTCNT(4); @@ -663,17 +685,21 @@ void Test_SB_Cmds_PipeInfoDef(void) */ void Test_SB_Cmds_PipeInfoSpec(void) { - CFE_SB_WriteFileInfoCmd_t WriteFileCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_SendPipeInfoCmd_t Cmd; + } SendPipeInfo; CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_PIPE_INFO_CC; CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(WriteFileCmd); + CFE_MSG_Size_t Size = sizeof(SendPipeInfo.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - strncpy((char *)WriteFileCmd.Payload.Filename, "PipeTstFile", sizeof(WriteFileCmd.Payload.Filename)); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &WriteFileCmd; - CFE_SB_ProcessCmdPipePkt(); + strncpy((char *)SendPipeInfo.Cmd.Payload.Filename, "PipeTstFile", + sizeof(SendPipeInfo.Cmd.Payload.Filename)); + CFE_SB_ProcessCmdPipePkt(&SendPipeInfo.SBBuf); EVTCNT(1); @@ -744,7 +770,11 @@ void Test_SB_Cmds_PipeInfoWriteFail(void) */ void Test_SB_Cmds_MapInfoDef(void) { - CFE_SB_WriteFileInfoCmd_t WriteFileCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_SendMapInfoCmd_t Cmd; + } SendMapInfo; CFE_SB_PipeId_t PipeId1; CFE_SB_PipeId_t PipeId2; CFE_SB_PipeId_t PipeId3; @@ -757,12 +787,12 @@ void Test_SB_Cmds_MapInfoDef(void) uint16 PipeDepth = 10; CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_MAP_INFO_CC; CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(WriteFileCmd); + CFE_MSG_Size_t Size = sizeof(SendMapInfo.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - strncpy((char *)WriteFileCmd.Payload.Filename, "", sizeof(WriteFileCmd.Payload.Filename)); + strncpy((char *)SendMapInfo.Cmd.Payload.Filename, "", sizeof(SendMapInfo.Cmd.Payload.Filename)); /* Create some map info */ SETUP(CFE_SB_CreatePipe(&PipeId1, PipeDepth, "TestPipe1")); @@ -775,9 +805,8 @@ void Test_SB_Cmds_MapInfoDef(void) SETUP(CFE_SB_Subscribe(MsgId3, PipeId3)); SETUP(CFE_SB_Subscribe(MsgId4, PipeId3)); SETUP(CFE_SB_Subscribe(MsgId5, PipeId2)); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &WriteFileCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&SendMapInfo.SBBuf); EVTCNT(18); @@ -798,17 +827,22 @@ void Test_SB_Cmds_MapInfoDef(void) */ void Test_SB_Cmds_MapInfoSpec(void) { - CFE_SB_WriteFileInfoCmd_t WriteFileCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_SendMapInfoCmd_t Cmd; + } SendMapInfo; CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_MAP_INFO_CC; CFE_SB_MsgId_t MsgId = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(WriteFileCmd); + CFE_MSG_Size_t Size = sizeof(SendMapInfo.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - strncpy((char *)WriteFileCmd.Payload.Filename, "MapTstFile", sizeof(WriteFileCmd.Payload.Filename)); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &WriteFileCmd; - CFE_SB_ProcessCmdPipePkt(); + strncpy((char *)SendMapInfo.Cmd.Payload.Filename, "MapTstFile", + sizeof(SendMapInfo.Cmd.Payload.Filename)); + + CFE_SB_ProcessCmdPipePkt(&SendMapInfo.SBBuf); EVTCNT(1); @@ -895,13 +929,18 @@ void Test_SB_Cmds_MapInfoWriteFail(void) */ void Test_SB_Cmds_EnRouteValParam(void) { - CFE_SB_RouteCmd_t EnDisRouteCmd; + + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_EnableRouteCmd_t Cmd; + } EnableRoute; CFE_SB_PipeId_t PipeId; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; uint16 PipeDepth = 5; CFE_MSG_FcnCode_t FcnCode = CFE_SB_ENABLE_ROUTE_CC; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(EnDisRouteCmd); + CFE_MSG_Size_t Size = sizeof(EnableRoute.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); @@ -909,11 +948,10 @@ void Test_SB_Cmds_EnRouteValParam(void) SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "EnRouteTestPipe")); SETUP(CFE_SB_Subscribe(MsgId, PipeId)); - EnDisRouteCmd.Payload.MsgId = MsgId; - EnDisRouteCmd.Payload.Pipe = PipeId; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnDisRouteCmd; + EnableRoute.Cmd.Payload.MsgId = MsgId; + EnableRoute.Cmd.Payload.Pipe = PipeId; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&EnableRoute.SBBuf); EVTCNT(4); @@ -932,14 +970,18 @@ void Test_SB_Cmds_EnRouteValParam(void) */ void Test_SB_Cmds_EnRouteNonExist(void) { - CFE_SB_RouteCmd_t EnDisRouteCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_EnableRouteCmd_t Cmd; + } EnableRoute; CFE_SB_PipeId_t PipeId1; CFE_SB_PipeId_t PipeId2; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; uint16 PipeDepth = 5; CFE_MSG_FcnCode_t FcnCode = CFE_SB_ENABLE_ROUTE_CC; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(EnDisRouteCmd); + CFE_MSG_Size_t Size = sizeof(EnableRoute.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); @@ -948,11 +990,10 @@ void Test_SB_Cmds_EnRouteNonExist(void) SETUP(CFE_SB_CreatePipe(&PipeId1, PipeDepth, "EnRouteTestPipe1")); SETUP(CFE_SB_CreatePipe(&PipeId2, PipeDepth, "EnRouteTestPipe2")); SETUP(CFE_SB_Subscribe(MsgId, PipeId1)); - EnDisRouteCmd.Payload.MsgId = MsgId; - EnDisRouteCmd.Payload.Pipe = PipeId2; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnDisRouteCmd; + EnableRoute.Cmd.Payload.MsgId = MsgId; + EnableRoute.Cmd.Payload.Pipe = PipeId2; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&EnableRoute.SBBuf); EVTCNT(5); @@ -970,20 +1011,23 @@ void Test_SB_Cmds_EnRouteNonExist(void) */ void Test_SB_Cmds_EnRouteInvParam(void) { - CFE_SB_RouteCmd_t EnDisRouteCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_EnableRouteCmd_t Cmd; + } EnableRoute; CFE_MSG_FcnCode_t FcnCode = CFE_SB_ENABLE_ROUTE_CC; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(EnDisRouteCmd); + CFE_MSG_Size_t Size = sizeof(EnableRoute.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - EnDisRouteCmd.Payload.MsgId = SB_UT_LAST_VALID_MID; - EnDisRouteCmd.Payload.Pipe = 3; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnDisRouteCmd; + EnableRoute.Cmd.Payload.MsgId = SB_UT_LAST_VALID_MID; + EnableRoute.Cmd.Payload.Pipe = 3; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&EnableRoute.SBBuf); EVTCNT(1); @@ -996,20 +1040,23 @@ void Test_SB_Cmds_EnRouteInvParam(void) */ void Test_SB_Cmds_EnRouteInvParam2(void) { - CFE_SB_RouteCmd_t EnDisRouteCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_EnableRouteCmd_t Cmd; + } EnableRoute; CFE_MSG_FcnCode_t FcnCode = CFE_SB_ENABLE_ROUTE_CC; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(EnDisRouteCmd); + CFE_MSG_Size_t Size = sizeof(EnableRoute.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - EnDisRouteCmd.Payload.MsgId = CFE_SB_INVALID_MSG_ID; - EnDisRouteCmd.Payload.Pipe = 3; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnDisRouteCmd; + EnableRoute.Cmd.Payload.MsgId = CFE_SB_INVALID_MSG_ID; + EnableRoute.Cmd.Payload.Pipe = 3; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&EnableRoute.SBBuf); EVTCNT(1); @@ -1023,20 +1070,23 @@ void Test_SB_Cmds_EnRouteInvParam2(void) */ void Test_SB_Cmds_EnRouteInvParam3(void) { - CFE_SB_RouteCmd_t EnDisRouteCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_EnableRouteCmd_t Cmd; + } EnableRoute; CFE_MSG_FcnCode_t FcnCode = CFE_SB_ENABLE_ROUTE_CC; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(EnDisRouteCmd); + CFE_MSG_Size_t Size = sizeof(EnableRoute.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - EnDisRouteCmd.Payload.MsgId = SB_UT_ALTERNATE_INVALID_MID; - EnDisRouteCmd.Payload.Pipe = 0; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnDisRouteCmd; + EnableRoute.Cmd.Payload.MsgId = SB_UT_ALTERNATE_INVALID_MID; + EnableRoute.Cmd.Payload.Pipe = 0; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&EnableRoute.SBBuf); EVTCNT(1); @@ -1049,13 +1099,17 @@ void Test_SB_Cmds_EnRouteInvParam3(void) */ void Test_SB_Cmds_DisRouteValParam(void) { - CFE_SB_RouteCmd_t EnDisRouteCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_DisableRouteCmd_t Cmd; + } DisableRoute; CFE_SB_PipeId_t PipeId; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; uint16 PipeDepth = 5; CFE_MSG_FcnCode_t FcnCode = CFE_SB_DISABLE_ROUTE_CC; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(EnDisRouteCmd); + CFE_MSG_Size_t Size = sizeof(DisableRoute.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); @@ -1063,10 +1117,10 @@ void Test_SB_Cmds_DisRouteValParam(void) SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "DisRouteTestPipe")); SETUP(CFE_SB_Subscribe(MsgId, PipeId)); - EnDisRouteCmd.Payload.MsgId = MsgId; - EnDisRouteCmd.Payload.Pipe = PipeId; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnDisRouteCmd; - CFE_SB_ProcessCmdPipePkt(); + DisableRoute.Cmd.Payload.MsgId = MsgId; + DisableRoute.Cmd.Payload.Pipe = PipeId; + + CFE_SB_ProcessCmdPipePkt(&DisableRoute.SBBuf); EVTCNT(4); @@ -1085,13 +1139,17 @@ void Test_SB_Cmds_DisRouteValParam(void) */ void Test_SB_Cmds_DisRouteNonExist(void) { - CFE_SB_RouteCmd_t EnDisRouteCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_DisableRouteCmd_t Cmd; + } DisableRoute; CFE_SB_PipeId_t PipeId1, PipeId2; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; uint16 PipeDepth = 5; CFE_MSG_FcnCode_t FcnCode = CFE_SB_DISABLE_ROUTE_CC; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(EnDisRouteCmd); + CFE_MSG_Size_t Size = sizeof(DisableRoute.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); @@ -1100,11 +1158,10 @@ void Test_SB_Cmds_DisRouteNonExist(void) SETUP(CFE_SB_CreatePipe(&PipeId1, PipeDepth, "DisRouteTestPipe1")); SETUP(CFE_SB_CreatePipe(&PipeId2, PipeDepth, "DisRouteTestPipe2")); SETUP(CFE_SB_Subscribe(MsgId, PipeId1)); - EnDisRouteCmd.Payload.MsgId = MsgId; - EnDisRouteCmd.Payload.Pipe = PipeId2; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnDisRouteCmd; + DisableRoute.Cmd.Payload.MsgId = MsgId; + DisableRoute.Cmd.Payload.Pipe = PipeId2; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&DisableRoute.SBBuf); EVTCNT(5); @@ -1122,20 +1179,23 @@ void Test_SB_Cmds_DisRouteNonExist(void) */ void Test_SB_Cmds_DisRouteInvParam(void) { - CFE_SB_RouteCmd_t EnDisRouteCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_DisableRouteCmd_t Cmd; + } DisableRoute; CFE_MSG_FcnCode_t FcnCode = CFE_SB_DISABLE_ROUTE_CC; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(EnDisRouteCmd); + CFE_MSG_Size_t Size = sizeof(DisableRoute.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - EnDisRouteCmd.Payload.MsgId = SB_UT_LAST_VALID_MID; - EnDisRouteCmd.Payload.Pipe = 3; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnDisRouteCmd; + DisableRoute.Cmd.Payload.MsgId = SB_UT_LAST_VALID_MID; + DisableRoute.Cmd.Payload.Pipe = 3; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&DisableRoute.SBBuf); EVTCNT(1); @@ -1148,20 +1208,23 @@ void Test_SB_Cmds_DisRouteInvParam(void) */ void Test_SB_Cmds_DisRouteInvParam2(void) { - CFE_SB_RouteCmd_t EnDisRouteCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_DisableRouteCmd_t Cmd; + } DisableRoute; CFE_MSG_FcnCode_t FcnCode = CFE_SB_DISABLE_ROUTE_CC; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(EnDisRouteCmd); + CFE_MSG_Size_t Size = sizeof(DisableRoute.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - EnDisRouteCmd.Payload.MsgId = CFE_SB_INVALID_MSG_ID; - EnDisRouteCmd.Payload.Pipe = 3; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnDisRouteCmd; + DisableRoute.Cmd.Payload.MsgId = CFE_SB_INVALID_MSG_ID; + DisableRoute.Cmd.Payload.Pipe = 3; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&DisableRoute.SBBuf); EVTCNT(1); @@ -1175,20 +1238,23 @@ void Test_SB_Cmds_DisRouteInvParam2(void) */ void Test_SB_Cmds_DisRouteInvParam3(void) { - CFE_SB_RouteCmd_t EnDisRouteCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_DisableRouteCmd_t Cmd; + } DisableRoute; CFE_MSG_FcnCode_t FcnCode = CFE_SB_DISABLE_ROUTE_CC; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(EnDisRouteCmd); + CFE_MSG_Size_t Size = sizeof(DisableRoute.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - EnDisRouteCmd.Payload.MsgId = SB_UT_ALTERNATE_INVALID_MID; - EnDisRouteCmd.Payload.Pipe = 0; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnDisRouteCmd; + DisableRoute.Cmd.Payload.MsgId = SB_UT_ALTERNATE_INVALID_MID; + DisableRoute.Cmd.Payload.Pipe = 0; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&DisableRoute.SBBuf); EVTCNT(1); @@ -1201,11 +1267,15 @@ void Test_SB_Cmds_DisRouteInvParam3(void) */ void Test_SB_Cmds_SendHK(void) { - CFE_SB_CmdHdr_t NoParamCmd; - CFE_SB_MsgId_t MsgIdCmd; - CFE_MSG_Size_t Size; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_MSG_CommandHeader_t Cmd; + } Housekeeping; + CFE_SB_MsgId_t MsgIdCmd; + CFE_MSG_Size_t Size; - /* For internal SendMsg call */ + /* For internal TransmitMsg call */ MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_HK_TLM_MID); Size = sizeof(CFE_SB.HKTlmMsg); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); @@ -1214,9 +1284,8 @@ void Test_SB_Cmds_SendHK(void) /* For HK command processing */ MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SEND_HK_MID); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&Housekeeping.SBBuf); EVTCNT(1); @@ -1230,19 +1299,22 @@ void Test_SB_Cmds_SendHK(void) */ void Test_SB_Cmds_SendPrevSubs(void) { - CFE_SB_SendPrevSubs_t NoParamCmd; - CFE_SB_PipeId_t PipeId1; - CFE_SB_PipeId_t PipeId2; - CFE_SB_MsgId_t MsgId = SB_UT_BARE_TLM_MID3; - uint16 MsgLim = 4; - uint16 PipeDepth = 50; - int32 i; - int32 NumEvts; - CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_PREV_SUBS_CC; - CFE_SB_MsgId_t MsgIdCmd; - CFE_MSG_Size_t Size; - - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_SendPrevSubsCmd_t Cmd; + } SendPrevSubs; + CFE_SB_PipeId_t PipeId1; + CFE_SB_PipeId_t PipeId2; + CFE_SB_MsgId_t MsgId = SB_UT_BARE_TLM_MID3; + uint16 MsgLim = 4; + uint16 PipeDepth = 50; + int32 i; + int32 NumEvts; + CFE_MSG_FcnCode_t FcnCode = CFE_SB_SEND_PREV_SUBS_CC; + CFE_SB_MsgId_t MsgIdCmd; + CFE_MSG_Size_t Size; + SETUP(CFE_SB_CreatePipe(&PipeId1, PipeDepth, "TestPipe1")); SETUP(CFE_SB_CreatePipe(&PipeId2, PipeDepth, "TestPipe2")); NumEvts = 2; /* one for each pipe create */ @@ -1267,7 +1339,7 @@ void Test_SB_Cmds_SendPrevSubs(void) SETUP(CFE_SB_SubscribeLocal(MsgId, PipeId2, MsgLim)); - /* For 3 internal SendMsg calls */ + /* For 3 internal TransmitMsg calls */ MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_ALLSUBS_TLM_MID); Size = sizeof(CFE_SB.PrevSubMsg); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); @@ -1279,12 +1351,12 @@ void Test_SB_Cmds_SendPrevSubs(void) /* Set buffers for gets */ MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); - Size = sizeof(CFE_SB_SendPrevSubs_t); + Size = sizeof(SendPrevSubs.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&SendPrevSubs.SBBuf); NumEvts += 8; /* +2 for the subscribe, +6 for the SEND_PREV_SUBS_CC */ @@ -1309,7 +1381,7 @@ void Test_SB_Cmds_SendPrevSubs(void) SETUP(CFE_SB_SubscribeLocal(MsgId, PipeId2, MsgLim)); - /* For 3 internal SendMsg calls */ + /* For 3 internal TransmitMsg calls */ MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_ALLSUBS_TLM_MID); Size = sizeof(CFE_SB.PrevSubMsg); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); @@ -1321,12 +1393,12 @@ void Test_SB_Cmds_SendPrevSubs(void) /* Set buffers for gets */ MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); - Size = sizeof(CFE_SB_SendPrevSubs_t); + Size = sizeof(SendPrevSubs.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&SendPrevSubs.SBBuf); NumEvts += 8; /* +2 for the subscribe, +6 for the SEND_PREV_SUBS_CC */ @@ -1355,17 +1427,20 @@ void Test_SB_Cmds_SendPrevSubs(void) */ void Test_SB_Cmds_SubRptOn(void) { - CFE_SB_CmdHdr_t NoParamCmd; - CFE_MSG_FcnCode_t FcnCode = CFE_SB_ENABLE_SUB_REPORTING_CC; - CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); - CFE_MSG_Size_t Size = sizeof(NoParamCmd); + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_EnableSubReportingCmd_t Cmd; + } EnableSubReporting; + CFE_MSG_FcnCode_t FcnCode = CFE_SB_ENABLE_SUB_REPORTING_CC; + CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); + CFE_MSG_Size_t Size = sizeof(EnableSubReporting.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&EnableSubReporting.SBBuf); EVTCNT(0); @@ -1376,17 +1451,20 @@ void Test_SB_Cmds_SubRptOn(void) */ void Test_SB_Cmds_SubRptOff(void) { - CFE_SB_CmdHdr_t NoParamCmd; - CFE_MSG_FcnCode_t FcnCode = CFE_SB_DISABLE_SUB_REPORTING_CC; - CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); - CFE_MSG_Size_t Size = sizeof(NoParamCmd); + union + { + CFE_SB_Buffer_t SBBuf; + CFE_SB_DisableSubReportingCmd_t Cmd; + } DisableSubReporting; + CFE_MSG_FcnCode_t FcnCode = CFE_SB_DISABLE_SUB_REPORTING_CC; + CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); + CFE_MSG_Size_t Size = sizeof(DisableSubReporting.Cmd); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&DisableSubReporting.SBBuf); EVTCNT(0); @@ -1397,7 +1475,6 @@ void Test_SB_Cmds_SubRptOff(void) */ void Test_SB_Cmds_CmdUnexpCmdCode(void) { - CFE_SB_CmdHdr_t NoParamCmd; CFE_MSG_FcnCode_t FcnCode = 99; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); @@ -1406,8 +1483,7 @@ void Test_SB_Cmds_CmdUnexpCmdCode(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); /* Use a command code known to be invalid */ - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt((CFE_SB_Buffer_t *)NULL); EVTCNT(1); EVTSENT(CFE_SB_BAD_CMD_CODE_EID); @@ -1418,7 +1494,6 @@ void Test_SB_Cmds_CmdUnexpCmdCode(void) */ void Test_SB_Cmds_SubRptUnexpCmdCode(void) { - CFE_SB_CmdHdr_t NoParamCmd; CFE_MSG_FcnCode_t FcnCode = 99; CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_SUB_RPT_CTRL_MID); @@ -1428,8 +1503,7 @@ void Test_SB_Cmds_SubRptUnexpCmdCode(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); /* Use a command code known to be invalid */ - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt((CFE_SB_Buffer_t *)NULL); EVTCNT(1); @@ -1445,10 +1519,9 @@ void Test_SB_Cmds_BadCmdLength(void) /* * Just choosing "EnableRoute" command here as it has a non-empty payload */ - CFE_SB_EnableRoute_t EnableRouteCmd; - CFE_MSG_FcnCode_t FcnCode = CFE_SB_ENABLE_ROUTE_CC; - CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); - CFE_MSG_Size_t Size = sizeof(EnableRouteCmd) - 1; + CFE_MSG_FcnCode_t FcnCode = CFE_SB_ENABLE_ROUTE_CC; + CFE_SB_MsgId_t MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_CMD_MID); + CFE_MSG_Size_t Size = sizeof(CFE_SB_EnableRouteCmd_t) - 1; /* Second GetMsgId and GetFcnCode are for reporting */ UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); @@ -1457,8 +1530,7 @@ void Test_SB_Cmds_BadCmdLength(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &EnableRouteCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt((CFE_SB_Buffer_t *)NULL); EVTCNT(1); @@ -1472,12 +1544,10 @@ void Test_SB_Cmds_BadCmdLength(void) void Test_SB_Cmds_UnexpMsgId(void) { CFE_SB_MsgId_t MsgIdCmd = SB_UT_TLM_MID; - CFE_SB_CmdHdr_t NoParamCmd; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt((CFE_SB_Buffer_t *)NULL); EVTCNT(1); @@ -2264,16 +2334,16 @@ void Test_Subscribe_MaxMsgIdCount(void) */ void Test_Subscribe_SendPrevSubs(void) { - CFE_SB_PipeId_t PipeId0; - CFE_SB_PipeId_t PipeId1; - CFE_SB_PipeId_t PipeId2; - CFE_SB_MsgId_t MsgId0 = SB_UT_TLM_MID1; - CFE_SB_MsgId_t MsgId1 = SB_UT_TLM_MID2; - CFE_SB_MsgId_t MsgId2 = SB_UT_TLM_MID3; - uint16 PipeDepth = 50; - CFE_SB_SendPrevSubs_t SendPrevSubsMsg; - CFE_SB_MsgId_t MsgIdCmd; - CFE_MSG_Size_t Size; + CFE_SB_PipeId_t PipeId0; + CFE_SB_PipeId_t PipeId1; + CFE_SB_PipeId_t PipeId2; + CFE_SB_MsgId_t MsgId0 = SB_UT_TLM_MID1; + CFE_SB_MsgId_t MsgId1 = SB_UT_TLM_MID2; + CFE_SB_MsgId_t MsgId2 = SB_UT_TLM_MID3; + uint16 PipeDepth = 50; + CFE_SB_SendPrevSubsCmd_t SendPrevSubsMsg; + CFE_SB_MsgId_t MsgIdCmd; + CFE_MSG_Size_t Size; /* note that the message is not currently used or required, * but creating one and initializing it for completeness, in @@ -2290,7 +2360,7 @@ void Test_Subscribe_SendPrevSubs(void) SETUP(CFE_SB_Subscribe(MsgId2, PipeId1)); SETUP(CFE_SB_Subscribe(MsgId0, PipeId2)); - /* For internal SendMsg call */ + /* For internal TransmitMsg call */ MsgIdCmd = CFE_SB_ValueToMsgId(CFE_SB_ALLSUBS_TLM_MID); Size = sizeof(CFE_SB.PrevSubMsg); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdCmd, sizeof(MsgIdCmd), false); @@ -2341,7 +2411,7 @@ void Test_Subscribe_SubscriptionReporting(void) /* Enable subscription reporting */ CFE_SB_SetSubscriptionReporting(CFE_SB_ENABLE); - /* For internal SendMsg call that will report subscription */ + /* For internal TransmitMsg call that will report subscription */ MsgIdRpt = CFE_SB_ValueToMsgId(CFE_SB_ONESUB_TLM_MID); Size = sizeof(CFE_SB.SubRprtMsg); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgIdRpt, sizeof(MsgIdRpt), false); @@ -2665,7 +2735,7 @@ void Test_Unsubscribe_GetDestPtr(void) SETUP(CFE_SB_Subscribe(MsgId, TestPipe2)); SETUP(CFE_SB_Unsubscribe(MsgId, TestPipe2)); - /* TODO for now just get route id and use it, will need update when stubbed */ + /* For now just get route id and use it, will need update when stubbed */ RouteId = CFE_SBR_GetRouteId(MsgId); ASSERT_TRUE(CFE_SB_GetDestPtr(RouteId, TestPipe2) == NULL); @@ -2681,91 +2751,88 @@ void Test_Unsubscribe_GetDestPtr(void) /* ** Function for calling SB send message API test functions */ -void Test_SendMsg_API(void) -{ - SB_UT_ADD_SUBTEST(Test_SendMsg_NullPtr); - SB_UT_ADD_SUBTEST(Test_SendMsg_NoSubscribers); - SB_UT_ADD_SUBTEST(Test_SendMsg_MaxMsgSizePlusOne); - SB_UT_ADD_SUBTEST(Test_SendMsg_BasicSend); - SB_UT_ADD_SUBTEST(Test_SendMsg_SequenceCount); - SB_UT_ADD_SUBTEST(Test_SendMsg_QueuePutError); - SB_UT_ADD_SUBTEST(Test_SendMsg_PipeFull); - SB_UT_ADD_SUBTEST(Test_SendMsg_MsgLimitExceeded); - SB_UT_ADD_SUBTEST(Test_SendMsg_GetPoolBufErr); - SB_UT_ADD_SUBTEST(Test_SendMsg_ZeroCopyGetPtr); - SB_UT_ADD_SUBTEST(Test_SendMsg_ZeroCopySend); - SB_UT_ADD_SUBTEST(Test_SendMsg_ZeroCopyPass); - SB_UT_ADD_SUBTEST(Test_SendMsg_ZeroCopyReleasePtr); - SB_UT_ADD_SUBTEST(Test_SendMsg_DisabledDestination); - SB_UT_ADD_SUBTEST(Test_SendMsg_SendWithMetadata); - SB_UT_ADD_SUBTEST(Test_SendMsg_MaxMsgSizePlusOne_ZeroCopy); - SB_UT_ADD_SUBTEST(Test_SendMsg_NoSubscribers_ZeroCopy); -} /* end Test_SendMsg_API */ +void Test_TransmitMsg_API(void) +{ + SB_UT_ADD_SUBTEST(Test_TransmitMsg_NullPtr); + SB_UT_ADD_SUBTEST(Test_TransmitMsg_NoSubscribers); + SB_UT_ADD_SUBTEST(Test_TransmitMsg_MaxMsgSizePlusOne); + SB_UT_ADD_SUBTEST(Test_TransmitMsg_BasicSend); + SB_UT_ADD_SUBTEST(Test_TransmitMsg_SequenceCount); + SB_UT_ADD_SUBTEST(Test_TransmitMsg_QueuePutError); + SB_UT_ADD_SUBTEST(Test_TransmitMsg_PipeFull); + SB_UT_ADD_SUBTEST(Test_TransmitMsg_MsgLimitExceeded); + SB_UT_ADD_SUBTEST(Test_TransmitMsg_GetPoolBufErr); + SB_UT_ADD_SUBTEST(Test_TransmitMsg_ZeroCopyGetPtr); + SB_UT_ADD_SUBTEST(Test_TransmitBuffer_IncrementSeqCnt); + SB_UT_ADD_SUBTEST(Test_TransmitBuffer_NoIncrement); + SB_UT_ADD_SUBTEST(Test_TransmitMsg_ZeroCopyReleasePtr); + SB_UT_ADD_SUBTEST(Test_TransmitMsg_DisabledDestination); + SB_UT_ADD_SUBTEST(Test_TransmitBufferFull); + SB_UT_ADD_SUBTEST(Test_TransmitMsgValidate_MaxMsgSizePlusOne); + SB_UT_ADD_SUBTEST(Test_TransmitMsgValidate_NoSubscribers); +} /* end Test_TransmitMsg_API */ /* ** Test response to sending a null message on the software bus */ -void Test_SendMsg_NullPtr(void) +void Test_TransmitMsg_NullPtr(void) { - ASSERT_EQ(CFE_SB_SendMsg(NULL), CFE_SB_BAD_ARGUMENT); + ASSERT_EQ(CFE_SB_TransmitMsg(NULL, true), CFE_SB_BAD_ARGUMENT); EVTCNT(1); EVTSENT(CFE_SB_SEND_BAD_ARG_EID); -} /* end Test_SendMsg_NullPtr */ +} /* end Test_TransmitMsg_NullPtr */ /* ** Test response to sending a message which has no subscribers */ -void Test_SendMsg_NoSubscribers(void) +void Test_TransmitMsg_NoSubscribers(void) { CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; CFE_MSG_Size_t Size = sizeof(TlmPkt); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); EVTCNT(1); EVTSENT(CFE_SB_SEND_NO_SUBS_EID); -} /* end Test_SendMsg_NoSubscribers */ +} /* end Test_TransmitMsg_NoSubscribers */ /* ** Test response to sending a message with the message size larger than allowed */ -void Test_SendMsg_MaxMsgSizePlusOne(void) +void Test_TransmitMsg_MaxMsgSizePlusOne(void) { CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; CFE_MSG_Size_t Size = CFE_MISSION_SB_MAX_SB_MSG_SIZE + 1; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - ASSERT_EQ(CFE_SB_SendMsg(TlmPktPtr), CFE_SB_MSG_TOO_BIG); + ASSERT_EQ(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true), CFE_SB_MSG_TOO_BIG); EVTCNT(1); EVTSENT(CFE_SB_MSG_TOO_BIG_EID); -} /* end Test_SendMsg_MaxMsgSizePlusOne */ +} /* end Test_TransmitMsg_MaxMsgSizePlusOne */ /* ** Test successfully sending a message on the software bus */ -void Test_SendMsg_BasicSend(void) +void Test_TransmitMsg_BasicSend(void) { CFE_SB_PipeId_t PipeId; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; int32 PipeDepth = 2; CFE_MSG_Size_t Size = sizeof(TlmPkt); CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; @@ -2777,13 +2844,13 @@ void Test_SendMsg_BasicSend(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); EVTCNT(3); TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SendMsg_BasicSend */ +} /* end Test_TransmitMsg_BasicSend */ /* Sequence count hook */ static int32 UT_CheckSetSequenceCount(void *UserObj, int32 StubRetcode, uint32 CallCount, const UT_StubContext_t *Context) @@ -2798,12 +2865,11 @@ static int32 UT_CheckSetSequenceCount(void *UserObj, int32 StubRetcode, uint32 C /* ** Test successful send/receive for packet sequence count */ -void Test_SendMsg_SequenceCount(void) +void Test_TransmitMsg_SequenceCount(void) { CFE_SB_PipeId_t PipeId; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; CFE_MSG_Size_t Size = sizeof(TlmPkt); CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; uint32 PipeDepth = 10; @@ -2818,14 +2884,14 @@ void Test_SendMsg_SequenceCount(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - SETUP(CFE_SB_SendMsg(TlmPktPtr)); + SETUP(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_MSG_SetSequenceCount)), 1); ASSERT_EQ(SeqCnt, 1); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - ASSERT(CFE_SB_PassMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, false)); /* Assert sequence count wasn't set */ ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_MSG_SetSequenceCount)), 1); @@ -2833,7 +2899,7 @@ void Test_SendMsg_SequenceCount(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); ASSERT_EQ(SeqCnt, 2); ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_MSG_SetSequenceCount)), 2); @@ -2845,7 +2911,7 @@ void Test_SendMsg_SequenceCount(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - SETUP(CFE_SB_SendMsg(TlmPktPtr)); /* increment to 3 */ + SETUP(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); /* increment to 3 */ ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_MSG_SetSequenceCount)), 3); SETUP(CFE_SB_Subscribe(MsgId, PipeId)); /* resubscribe so we can receive a msg */ @@ -2853,23 +2919,22 @@ void Test_SendMsg_SequenceCount(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - SETUP(CFE_SB_SendMsg(TlmPktPtr)); /* increment to 4 */ + SETUP(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); /* increment to 4 */ ASSERT_EQ(SeqCnt, 4); ASSERT_EQ(UT_GetStubCount(UT_KEY(CFE_MSG_SetSequenceCount)), 4); TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SendMsg_SequenceCount */ +} /* end Test_TransmitMsg_SequenceCount */ /* ** Test send message response to a socket queue 'put' error */ -void Test_SendMsg_QueuePutError(void) +void Test_TransmitMsg_QueuePutError(void) { CFE_SB_PipeId_t PipeId4Error; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; int32 PipeDepth = 2; CFE_MSG_Size_t Size = sizeof(TlmPkt); CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; @@ -2881,7 +2946,7 @@ void Test_SendMsg_QueuePutError(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); EVTCNT(5); @@ -2889,17 +2954,16 @@ void Test_SendMsg_QueuePutError(void) TEARDOWN(CFE_SB_DeletePipe(PipeId4Error)); -} /* end Test_SendMsg_QueuePutError */ +} /* end Test_TransmitMsg_QueuePutError */ /* ** Test send message response when the socket queue is full */ -void Test_SendMsg_PipeFull(void) +void Test_TransmitMsg_PipeFull(void) { CFE_SB_PipeId_t PipeId; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; int32 PipeDepth = 1; CFE_MSG_Size_t Size = sizeof(TlmPkt); CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; @@ -2911,7 +2975,7 @@ void Test_SendMsg_PipeFull(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* This send should pass */ - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); /* Tell the QueuePut stub to return OS_QUEUE_FULL on its next call */ UT_SetDeferredRetcode(UT_KEY(OS_QueuePut), 1, OS_QUEUE_FULL); @@ -2920,8 +2984,8 @@ void Test_SendMsg_PipeFull(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - /* Pipe overflow causes SendMsg to return CFE_SUCCESS */ - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + /* Pipe overflow causes TransmitMsg to return CFE_SUCCESS */ + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); EVTCNT(5); @@ -2929,17 +2993,16 @@ void Test_SendMsg_PipeFull(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SendMsg_PipeFull */ +} /* end Test_TransmitMsg_PipeFull */ /* ** Test send message response to too many messages sent to the pipe */ -void Test_SendMsg_MsgLimitExceeded(void) +void Test_TransmitMsg_MsgLimitExceeded(void) { CFE_SB_PipeId_t PipeId; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; int32 PipeDepth = 5; CFE_MSG_Size_t Size = sizeof(TlmPkt); CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; @@ -2954,7 +3017,7 @@ void Test_SendMsg_MsgLimitExceeded(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* First send should pass */ - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); @@ -2963,7 +3026,7 @@ void Test_SendMsg_MsgLimitExceeded(void) /* This send should produce a MsgId to Pipe Limit Exceeded message, but * return success */ - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); EVTCNT(5); @@ -2971,17 +3034,16 @@ void Test_SendMsg_MsgLimitExceeded(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SendMsg_MsgLimitExceeded */ +} /* end Test_TransmitMsg_MsgLimitExceeded */ /* ** Test send message response to a buffer descriptor allocation failure */ -void Test_SendMsg_GetPoolBufErr(void) +void Test_TransmitMsg_GetPoolBufErr(void) { CFE_SB_PipeId_t PipeId; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; int32 PipeDepth; CFE_MSG_Size_t Size = sizeof(TlmPkt); @@ -2995,7 +3057,7 @@ void Test_SendMsg_GetPoolBufErr(void) * allocation failed) */ UT_SetDeferredRetcode(UT_KEY(CFE_ES_GetPoolBuf), 1, CFE_ES_ERR_MEM_BLOCK_SIZE); - ASSERT_EQ(CFE_SB_SendMsg(TlmPktPtr), CFE_SB_BUF_ALOC_ERR); + ASSERT_EQ(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true), CFE_SB_BUF_ALOC_ERR); EVTCNT(4); @@ -3003,13 +3065,13 @@ void Test_SendMsg_GetPoolBufErr(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SendMsg_GetPoolBufErr */ +} /* end Test_TransmitMsg_GetPoolBufErr */ /* ** Test getting a pointer to a buffer for zero copy mode with buffer ** allocation failures */ -void Test_SendMsg_ZeroCopyGetPtr(void) +void Test_TransmitMsg_ZeroCopyGetPtr(void) { CFE_SB_ZeroCopyHandle_t ZeroCpyBufHndl; uint16 MsgSize = 10; @@ -3054,18 +3116,18 @@ void Test_SendMsg_ZeroCopyGetPtr(void) EVTCNT(0); -} /* end Test_SendMsg_ZeroCopyGetPtr */ +} /* end Test_TransmitMsg_ZeroCopyGetPtr */ /* ** Test successfully sending a message in zero copy mode (telemetry source ** sequence count increments) */ -void Test_SendMsg_ZeroCopySend(void) +void Test_TransmitBuffer_IncrementSeqCnt(void) { - CFE_MSG_Message_t *PtrToMsg; + CFE_SB_Buffer_t *SendPtr = NULL; + CFE_SB_Buffer_t *ReceivePtr = NULL; CFE_SB_PipeId_t PipeId; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; - CFE_MSG_Message_t *ZeroCpyMsgPtr = NULL; uint32 PipeDepth = 10; CFE_SB_ZeroCopyHandle_t ZeroCpyBufHndl = 0; CFE_MSG_SequenceCount_t SeqCnt; @@ -3079,26 +3141,26 @@ void Test_SendMsg_ZeroCopySend(void) SETUP(CFE_SB_Subscribe(MsgId, PipeId)); - ZeroCpyMsgPtr = CFE_SB_ZeroCopyGetPtr(sizeof(SB_UT_Test_Tlm_t),&ZeroCpyBufHndl); - if (ZeroCpyMsgPtr == NULL) + SendPtr = CFE_SB_ZeroCopyGetPtr(sizeof(SB_UT_Test_Tlm_t), &ZeroCpyBufHndl); + if (SendPtr == NULL) { UtAssert_Failed("Unexpected NULL pointer returned from ZeroCopyGetPtr"); } /* Test response to a get pool information error */ UT_SetDeferredRetcode(UT_KEY(CFE_ES_GetPoolBufInfo), 1, -1); - ASSERT_EQ(CFE_SB_ZeroCopySend(ZeroCpyMsgPtr, ZeroCpyBufHndl), CFE_SB_BUFFER_INVALID); + ASSERT_EQ(CFE_SB_TransmitBuffer(SendPtr, ZeroCpyBufHndl, true), CFE_SB_BUFFER_INVALID); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* Test a successful zero copy send */ - ASSERT(CFE_SB_ZeroCopySend(ZeroCpyMsgPtr, ZeroCpyBufHndl)); + ASSERT(CFE_SB_TransmitBuffer(SendPtr, ZeroCpyBufHndl, true)); - ASSERT(CFE_SB_RcvMsg(&PtrToMsg, PipeId, CFE_SB_PEND_FOREVER)); + ASSERT(CFE_SB_ReceiveBuffer(&ReceivePtr, PipeId, CFE_SB_PEND_FOREVER)); - ASSERT_TRUE(PtrToMsg != NULL); + ASSERT_TRUE(SendPtr == ReceivePtr); ASSERT_EQ(SeqCnt, 1); @@ -3108,18 +3170,18 @@ void Test_SendMsg_ZeroCopySend(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SendMsg_ZeroCopySend */ +} /* ** Test successfully sending a message in zero copy mode (telemetry source ** sequence count is unchanged) */ -void Test_SendMsg_ZeroCopyPass(void) +void Test_TransmitBuffer_NoIncrement(void) { - CFE_MSG_Message_t *PtrToMsg; + CFE_SB_Buffer_t *SendPtr = NULL; + CFE_SB_Buffer_t *ReceivePtr = NULL; CFE_SB_PipeId_t PipeId; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; - CFE_MSG_Message_t *ZeroCpyMsgPtr = NULL; uint32 PipeDepth = 10; CFE_SB_ZeroCopyHandle_t ZeroCpyBufHndl = 0; CFE_MSG_SequenceCount_t SeqCnt = 22; @@ -3132,27 +3194,26 @@ void Test_SendMsg_ZeroCopyPass(void) SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "ZeroCpyPassTestPipe")); SETUP(CFE_SB_Subscribe(MsgId, PipeId)); - ZeroCpyMsgPtr = CFE_SB_ZeroCopyGetPtr(sizeof(SB_UT_Test_Tlm_t), - &ZeroCpyBufHndl); + SendPtr = CFE_SB_ZeroCopyGetPtr(sizeof(SB_UT_Test_Tlm_t), &ZeroCpyBufHndl); - if (ZeroCpyMsgPtr == NULL) + if (SendPtr == NULL) { UtAssert_Failed("Unexpected NULL pointer returned from ZeroCopyGetPtr"); } /* Test response to a get pool information error */ UT_SetDeferredRetcode(UT_KEY(CFE_ES_GetPoolBufInfo), 1, -1); - ASSERT_EQ(CFE_SB_ZeroCopyPass(ZeroCpyMsgPtr, ZeroCpyBufHndl), CFE_SB_BUFFER_INVALID); + ASSERT_EQ(CFE_SB_TransmitBuffer(SendPtr, ZeroCpyBufHndl, false), CFE_SB_BUFFER_INVALID); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* Test a successful zero copy pass */ - ASSERT(CFE_SB_ZeroCopyPass(ZeroCpyMsgPtr, ZeroCpyBufHndl)); - ASSERT(CFE_SB_RcvMsg(&PtrToMsg, PipeId, CFE_SB_PEND_FOREVER)); + ASSERT(CFE_SB_TransmitBuffer(SendPtr, ZeroCpyBufHndl, false)); + ASSERT(CFE_SB_ReceiveBuffer(&ReceivePtr, PipeId, CFE_SB_PEND_FOREVER)); - ASSERT_TRUE(PtrToMsg != NULL); + ASSERT_TRUE(SendPtr == ReceivePtr); ASSERT_EQ(SeqCnt, 22); EVTCNT(3); @@ -3161,16 +3222,16 @@ void Test_SendMsg_ZeroCopyPass(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SendMsg_ZeroCopyPass */ +} /* ** Test releasing a pointer to a buffer for zero copy mode */ -void Test_SendMsg_ZeroCopyReleasePtr(void) +void Test_TransmitMsg_ZeroCopyReleasePtr(void) { - CFE_MSG_Message_t *ZeroCpyMsgPtr1 = NULL; - CFE_MSG_Message_t *ZeroCpyMsgPtr2 = NULL; - CFE_MSG_Message_t *ZeroCpyMsgPtr3 = NULL; + CFE_SB_Buffer_t *ZeroCpyMsgPtr1 = NULL; + CFE_SB_Buffer_t *ZeroCpyMsgPtr2 = NULL; + CFE_SB_Buffer_t *ZeroCpyMsgPtr3 = NULL; CFE_SB_ZeroCopyHandle_t ZeroCpyBufHndl1 = 0; CFE_SB_ZeroCopyHandle_t ZeroCpyBufHndl2 = 0; CFE_SB_ZeroCopyHandle_t ZeroCpyBufHndl3 = 0; @@ -3189,7 +3250,7 @@ void Test_SendMsg_ZeroCopyReleasePtr(void) ASSERT_EQ(CFE_SB_ZeroCopyReleasePtr(NULL, ZeroCpyBufHndl2), CFE_SB_BUFFER_INVALID); /* Test response to an invalid message pointer */ - ASSERT_EQ(CFE_SB_ZeroCopyReleasePtr((CFE_MSG_Message_t *) 0x1234, + ASSERT_EQ(CFE_SB_ZeroCopyReleasePtr((CFE_SB_Buffer_t *) 0x1234, ZeroCpyBufHndl2), CFE_SB_BUFFER_INVALID); /* Test path when return the descriptor to the pool fails in @@ -3212,17 +3273,16 @@ void Test_SendMsg_ZeroCopyReleasePtr(void) EVTCNT(0); -} /* end Test_SendMsg_ZeroCopyReleasePtr */ +} /* end Test_TransmitMsg_ZeroCopyReleasePtr */ /* ** Test send message response with the destination disabled */ -void Test_SendMsg_DisabledDestination(void) +void Test_TransmitMsg_DisabledDestination(void) { CFE_SB_PipeId_t PipeId; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; CFE_SB_DestinationD_t *DestPtr; int32 PipeDepth; CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; @@ -3242,7 +3302,7 @@ void Test_SendMsg_DisabledDestination(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); EVTCNT(3); @@ -3250,164 +3310,132 @@ void Test_SendMsg_DisabledDestination(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SendMsg_DisabledDestination */ +} /* end Test_TransmitMsg_DisabledDestination */ /* -** Test successfully sending a message with the metadata +** Test successful CFE_SB_TransmitBufferFull */ -void Test_SendMsg_SendWithMetadata(void) +void Test_TransmitBufferFull(void) { - CFE_SB_PipeId_t PipeId; - CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; - - struct - { - /* To exercise the CFE_SB_SEND_ZEROCOPY feature, - * the packet data must already be enclosed in a - * buffer descriptor - */ - CFE_SB_BufferD_t BufDesc; - SB_UT_Test_Tlm_t TlmPkt; - } TlmPktBufDesc; - - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPktBufDesc.TlmPkt; - int32 PipeDepth; - CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; - CFE_MSG_Size_t Size = sizeof(TlmPktBufDesc.TlmPkt); + CFE_SB_PipeId_t PipeId; + CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; + CFE_SB_BufferD_t SBBufD; + CFE_MSG_Message_t Msg; + int32 PipeDepth; + CFE_SBR_RouteId_t RouteId; - memset(&TlmPktBufDesc, 0, sizeof(TlmPktBufDesc)); + SBBufD.Buffer = &Msg; PipeDepth = 2; SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "TestPipe")); SETUP(CFE_SB_Subscribe(MsgId, PipeId)); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); + RouteId = CFE_SBR_GetRouteId(MsgId); - ASSERT(CFE_SB_SendMsgFull(TlmPktPtr, CFE_SB_DO_NOT_INCREMENT, - CFE_SB_SEND_ZEROCOPY)); + ASSERT(CFE_SB_TransmitBufferFull(&SBBufD, RouteId, MsgId)); EVTCNT(3); TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SendMsg_SendWithMetadata */ +} /* end Test_TransmitBufferFull */ /* ** Test response to sending a message with the message size larger than allowed -** and ZeroCopy is set */ -void Test_SendMsg_MaxMsgSizePlusOne_ZeroCopy(void) +void Test_TransmitMsgValidate_MaxMsgSizePlusOne(void) { - CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; - SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr; - CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; - CFE_MSG_Size_t Size = CFE_MISSION_SB_MAX_SB_MSG_SIZE + 1; - - TlmPktPtr = CFE_SB_ZeroCopyGetPtr(sizeof(SB_UT_Test_Tlm_t), - (CFE_SB_ZeroCopyHandle_t *) &TlmPkt); - if (TlmPktPtr == NULL) - { - UtAssert_Failed("Unexpected NULL pointer returned from ZeroCopyGetPtr"); - } - else - { - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); + CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; + CFE_SB_MsgId_t MsgIdRtn; + SB_UT_Test_Tlm_t TlmPkt; + CFE_MSG_Size_t Size = CFE_MISSION_SB_MAX_SB_MSG_SIZE + 1; + CFE_MSG_Size_t SizeRtn; + CFE_SBR_RouteId_t RouteIdRtn; - ASSERT_EQ(CFE_SB_SendMsgFull(TlmPktPtr, CFE_SB_INCREMENT_TLM, - CFE_SB_SEND_ZEROCOPY), CFE_SB_MSG_TOO_BIG); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - } + ASSERT_EQ(CFE_SB_TransmitMsgValidate(&TlmPkt.Hdr.Msg, &MsgIdRtn, &SizeRtn, &RouteIdRtn), CFE_SB_MSG_TOO_BIG); + ASSERT_EQ(CFE_SB_MsgIdToValue(MsgIdRtn), CFE_SB_MsgIdToValue(MsgId)); + ASSERT_EQ(SizeRtn, Size); EVTCNT(1); EVTSENT(CFE_SB_MSG_TOO_BIG_EID); -} /* end Test_SendMsg_MaxMsgSizePlusOne_ZeroCopy */ +} /* -** Test response to sending a message which has no subscribers and ZeroCopy is -** set +** Test response to sending a message which has no subscribers */ -void Test_SendMsg_NoSubscribers_ZeroCopy(void) +void Test_TransmitMsgValidate_NoSubscribers(void) { CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; + CFE_SB_MsgId_t MsgIdRtn; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr; - CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; CFE_MSG_Size_t Size = sizeof(TlmPkt); + CFE_MSG_Size_t SizeRtn; + CFE_SBR_RouteId_t RouteIdRtn; - TlmPktPtr = CFE_SB_ZeroCopyGetPtr(sizeof(SB_UT_Test_Tlm_t), - (CFE_SB_ZeroCopyHandle_t *) &TlmPkt); - if (TlmPktPtr == NULL) - { - UtAssert_Failed("Unexpected NULL pointer returned from ZeroCopyGetPtr"); - } - else - { - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); + UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); - ASSERT(CFE_SB_SendMsgFull(TlmPktPtr, CFE_SB_INCREMENT_TLM, - CFE_SB_SEND_ZEROCOPY)); - } + ASSERT(CFE_SB_TransmitMsgValidate(&TlmPkt.Hdr.Msg, &MsgIdRtn, &SizeRtn, &RouteIdRtn)); + ASSERT_EQ(CFE_SB_MsgIdToValue(MsgIdRtn), CFE_SB_MsgIdToValue(MsgId)); + ASSERT_EQ(SizeRtn, Size); + ASSERT_TRUE(!CFE_SBR_IsValidRouteId(RouteIdRtn)); EVTCNT(1); EVTSENT(CFE_SB_SEND_NO_SUBS_EID); -} /* end Test_SendMsg_NoSubscribers_ZeroCopy */ +} /* ** Function for calling SB receive message API test functions */ -void Test_RcvMsg_API(void) +void Test_ReceiveBuffer_API(void) { - SB_UT_ADD_SUBTEST(Test_RcvMsg_InvalidPipeId); - SB_UT_ADD_SUBTEST(Test_RcvMsg_InvalidTimeout); - SB_UT_ADD_SUBTEST(Test_RcvMsg_Poll); - SB_UT_ADD_SUBTEST(Test_RcvMsg_Timeout); - SB_UT_ADD_SUBTEST(Test_RcvMsg_PipeReadError); - SB_UT_ADD_SUBTEST(Test_RcvMsg_PendForever); - SB_UT_ADD_SUBTEST(Test_RcvMsg_InvalidBufferPtr); -} /* end Test_RcvMsg_API */ + SB_UT_ADD_SUBTEST(Test_ReceiveBuffer_InvalidPipeId); + SB_UT_ADD_SUBTEST(Test_ReceiveBuffer_InvalidTimeout); + SB_UT_ADD_SUBTEST(Test_ReceiveBuffer_Poll); + SB_UT_ADD_SUBTEST(Test_ReceiveBuffer_Timeout); + SB_UT_ADD_SUBTEST(Test_ReceiveBuffer_PipeReadError); + SB_UT_ADD_SUBTEST(Test_ReceiveBuffer_PendForever); + SB_UT_ADD_SUBTEST(Test_ReceiveBuffer_InvalidBufferPtr); +} /* end Test_ReceiveBuffer_API */ /* ** Test receiving a message from the software bus with an invalid pipe ID */ -void Test_RcvMsg_InvalidPipeId(void) +void Test_ReceiveBuffer_InvalidPipeId(void) { - CFE_MSG_Message_t *PtrToMsg; + CFE_SB_Buffer_t *SBBufPtr; CFE_SB_PipeId_t InvalidPipeId = 20; CFE_SB.PipeTbl[InvalidPipeId].InUse = CFE_SB_NOT_IN_USE; - ASSERT_EQ(CFE_SB_RcvMsg(&PtrToMsg, InvalidPipeId, CFE_SB_POLL), CFE_SB_BAD_ARGUMENT); + ASSERT_EQ(CFE_SB_ReceiveBuffer(&SBBufPtr, InvalidPipeId, CFE_SB_POLL), CFE_SB_BAD_ARGUMENT); EVTCNT(1); EVTSENT(CFE_SB_BAD_PIPEID_EID); -} /* end Test_RcvMsg_InvalidPipeId */ +} /* end Test_ReceiveBuffer_InvalidPipeId */ /* ** Test receiving a message response to invalid timeout value (< -1) */ -void Test_RcvMsg_InvalidTimeout(void) +void Test_ReceiveBuffer_InvalidTimeout(void) { - CFE_MSG_Message_t *PtrToMsg; + CFE_SB_Buffer_t *SBBufPtr; CFE_SB_PipeId_t PipeId; uint32 PipeDepth = 10; int32 TimeOut = -5; - SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvMsgTestPipe")); + SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvTestPipe")); - ASSERT_EQ(CFE_SB_RcvMsg(&PtrToMsg, PipeId, TimeOut), CFE_SB_BAD_ARGUMENT); + ASSERT_EQ(CFE_SB_ReceiveBuffer(&SBBufPtr, PipeId, TimeOut), CFE_SB_BAD_ARGUMENT); EVTCNT(2); @@ -3415,20 +3443,20 @@ void Test_RcvMsg_InvalidTimeout(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_RcvMsg_InvalidTimeout */ +} /* end Test_ReceiveBuffer_InvalidTimeout */ /* ** Test receiving a message response when there is no message on the queue */ -void Test_RcvMsg_Poll(void) +void Test_ReceiveBuffer_Poll(void) { - CFE_MSG_Message_t *PtrToMsg; + CFE_SB_Buffer_t *SBBufPtr; CFE_SB_PipeId_t PipeId; uint32 PipeDepth = 10; - SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvMsgTestPipe")); + SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvTestPipe")); - ASSERT_EQ(CFE_SB_RcvMsg(&PtrToMsg, PipeId, CFE_SB_POLL), CFE_SB_NO_MESSAGE); + ASSERT_EQ(CFE_SB_ReceiveBuffer(&SBBufPtr, PipeId, CFE_SB_POLL), CFE_SB_NO_MESSAGE); EVTCNT(1); @@ -3436,22 +3464,22 @@ void Test_RcvMsg_Poll(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_RcvMsg_Poll */ +} /* end Test_ReceiveBuffer_Poll */ /* ** Test receiving a message response to a timeout */ -void Test_RcvMsg_Timeout(void) +void Test_ReceiveBuffer_Timeout(void) { - CFE_MSG_Message_t *PtrToMsg; + CFE_SB_Buffer_t *SBBufPtr; CFE_SB_PipeId_t PipeId; uint32 PipeDepth = 10; int32 TimeOut = 200; - SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvMsgTestPipe")); + SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvTestPipe")); UT_SetDeferredRetcode(UT_KEY(OS_QueueGet), 1, OS_QUEUE_TIMEOUT); - ASSERT_EQ(CFE_SB_RcvMsg(&PtrToMsg, PipeId, TimeOut), CFE_SB_TIME_OUT); + ASSERT_EQ(CFE_SB_ReceiveBuffer(&SBBufPtr, PipeId, TimeOut), CFE_SB_TIME_OUT); EVTCNT(1); @@ -3459,20 +3487,20 @@ void Test_RcvMsg_Timeout(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_RcvMsg_Timeout */ +} /* end Test_ReceiveBuffer_Timeout */ /* ** Test receiving a message response to a pipe read error */ -void Test_RcvMsg_PipeReadError(void) +void Test_ReceiveBuffer_PipeReadError(void) { - CFE_MSG_Message_t *PtrToMsg; + CFE_SB_Buffer_t *SBBufPtr; CFE_SB_PipeId_t PipeId; uint32 PipeDepth = 10; - SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvMsgTestPipe")); + SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvTestPipe")); UT_SetDeferredRetcode(UT_KEY(OS_QueueGet), 1, OS_ERROR); - ASSERT_EQ(CFE_SB_RcvMsg(&PtrToMsg, PipeId, CFE_SB_PEND_FOREVER), CFE_SB_PIPE_RD_ERR); + ASSERT_EQ(CFE_SB_ReceiveBuffer(&SBBufPtr, PipeId, CFE_SB_PEND_FOREVER), CFE_SB_PIPE_RD_ERR); EVTCNT(3); @@ -3480,33 +3508,32 @@ void Test_RcvMsg_PipeReadError(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_RcvMsg_PipeReadError */ +} /* end Test_ReceiveBuffer_PipeReadError */ /* ** Test receiving a message response to a "pend forever" timeout */ -void Test_RcvMsg_PendForever(void) +void Test_ReceiveBuffer_PendForever(void) { - CFE_MSG_Message_t *PtrToMsg; + CFE_SB_Buffer_t *SBBufPtr; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; CFE_SB_PipeId_t PipeId; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; CFE_SB_PipeD_t *PipeDscPtr; uint32 PipeDepth = 10; CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; CFE_MSG_Size_t Size = sizeof(TlmPkt); - SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvMsgTestPipe")); + SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvTestPipe")); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); SETUP(CFE_SB_Subscribe(MsgId, PipeId)); - SETUP(CFE_SB_SendMsg(TlmPktPtr)); + SETUP(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); - ASSERT(CFE_SB_RcvMsg(&PtrToMsg, PipeId, CFE_SB_PEND_FOREVER)); + ASSERT(CFE_SB_ReceiveBuffer(&SBBufPtr, PipeId, CFE_SB_PEND_FOREVER)); - ASSERT_TRUE(PtrToMsg != NULL); + ASSERT_TRUE(SBBufPtr != NULL); EVTCNT(3); @@ -3518,7 +3545,7 @@ void Test_RcvMsg_PendForever(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_RcvMsg_PendForever */ +} /* end Test_ReceiveBuffer_PendForever */ /* ** Test releasing zero copy buffers for all pipes owned by a given app ID @@ -3563,14 +3590,14 @@ void Test_CleanupApp_API(void) /* ** Test receiving a message response to invalid buffer pointer (null) */ -void Test_RcvMsg_InvalidBufferPtr(void) +void Test_ReceiveBuffer_InvalidBufferPtr(void) { CFE_SB_PipeId_t PipeId; uint32 PipeDepth = 10; - SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvMsgTestPipe")); + SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvTestPipe")); - ASSERT_EQ(CFE_SB_RcvMsg(NULL, PipeId, CFE_SB_PEND_FOREVER), CFE_SB_BAD_ARGUMENT); + ASSERT_EQ(CFE_SB_ReceiveBuffer(NULL, PipeId, CFE_SB_PEND_FOREVER), CFE_SB_BAD_ARGUMENT); EVTCNT(2); @@ -3578,7 +3605,7 @@ void Test_RcvMsg_InvalidBufferPtr(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_RcvMsg_InvalidBufferPtr */ +} /* end Test_ReceiveBuffer_InvalidBufferPtr */ /* ** Test SB Utility APIs @@ -3605,20 +3632,20 @@ void Test_CFE_SB_MsgHdrSize(void) type = CFE_MSG_Type_Invalid; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetHasSecondaryHeader), &hassec, sizeof(hassec), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &type, sizeof(type), false); - ASSERT_EQ(CFE_SB_MsgHdrSize(&msg), sizeof(CCSDS_SpacePacket_t)); + ASSERT_EQ(CFE_SB_MsgHdrSize(&msg), sizeof(CFE_MSG_Message_t)); /* Has secondary, tlm type */ hassec = true; type = CFE_MSG_Type_Tlm; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetHasSecondaryHeader), &hassec, sizeof(hassec), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &type, sizeof(type), false); - ASSERT_EQ(CFE_SB_MsgHdrSize(&msg), sizeof(CFE_SB_TlmHdr_t)); + ASSERT_EQ(CFE_SB_MsgHdrSize(&msg), sizeof(CFE_MSG_TelemetryHeader_t)); /* Has secondary, cmd type */ type = CFE_MSG_Type_Cmd; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetHasSecondaryHeader), &hassec, sizeof(hassec), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &type, sizeof(type), false); - ASSERT_EQ(CFE_SB_MsgHdrSize(&msg), sizeof(CFE_SB_CmdHdr_t)); + ASSERT_EQ(CFE_SB_MsgHdrSize(&msg), sizeof(CFE_MSG_CommandHeader_t)); /* Has secondary, invalid type */ type = CFE_MSG_Type_Invalid; @@ -3700,12 +3727,12 @@ void Test_SB_SpecialCases(void) SB_UT_ADD_SUBTEST(Test_CFE_SB_GetPipeIdx); SB_UT_ADD_SUBTEST(Test_CFE_SB_Buffers); SB_UT_ADD_SUBTEST(Test_CFE_SB_BadPipeInfo); - SB_UT_ADD_SUBTEST(Test_SB_SendMsgPaths_Nominal); - SB_UT_ADD_SUBTEST(Test_SB_SendMsgPaths_LimitErr); - SB_UT_ADD_SUBTEST(Test_SB_SendMsgPaths_FullErr); - SB_UT_ADD_SUBTEST(Test_SB_SendMsgPaths_WriteErr); - SB_UT_ADD_SUBTEST(Test_SB_SendMsgPaths_IgnoreOpt); - SB_UT_ADD_SUBTEST(Test_RcvMsg_UnsubResubPath); + SB_UT_ADD_SUBTEST(Test_SB_TransmitMsgPaths_Nominal); + SB_UT_ADD_SUBTEST(Test_SB_TransmitMsgPaths_LimitErr); + SB_UT_ADD_SUBTEST(Test_SB_TransmitMsgPaths_FullErr); + SB_UT_ADD_SUBTEST(Test_SB_TransmitMsgPaths_WriteErr); + SB_UT_ADD_SUBTEST(Test_SB_TransmitMsgPaths_IgnoreOpt); + SB_UT_ADD_SUBTEST(Test_ReceiveBuffer_UnsubResubPath); SB_UT_ADD_SUBTEST(Test_MessageString); } /* end Test_SB_SpecialCases */ @@ -3858,18 +3885,21 @@ void Test_CFE_SB_BadPipeInfo(void) /* ** Test send housekeeping information command */ -void Test_SB_SendMsgPaths_Nominal(void) +void Test_SB_TransmitMsgPaths_Nominal(void) { - CFE_SB_CmdHdr_t NoParamCmd; - CFE_SB_MsgId_t MsgId; - CFE_SB_PipeId_t PipeId; - SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; - int32 PipeDepth = 2; - CFE_MSG_Size_t Size; - CFE_MSG_Type_t Type; + union + { + CFE_SB_Buffer_t SBBuf; + CFE_MSG_CommandHeader_t Cmd; + } Housekeeping; + CFE_SB_MsgId_t MsgId; + CFE_SB_PipeId_t PipeId; + SB_UT_Test_Tlm_t TlmPkt; + int32 PipeDepth = 2; + CFE_MSG_Size_t Size; + CFE_MSG_Type_t Type; - /* For internal SendMsg call */ + /* For internal send message call */ MsgId = CFE_SB_ValueToMsgId(CFE_SB_HK_TLM_MID); Size = sizeof(CFE_SB.HKTlmMsg); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); @@ -3881,9 +3911,8 @@ void Test_SB_SendMsgPaths_Nominal(void) /* Repress sending the no subscriptions event and process request */ CFE_SB.HKTlmMsg.Payload.NoSubscribersCounter = 0; - CFE_SB.CmdPipePktPtr = (CFE_MSG_Message_t *) &NoParamCmd; CFE_SB.StopRecurseFlags[1] |= CFE_BIT(CFE_SB_SEND_NO_SUBS_EID_BIT); - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&Housekeeping.SBBuf); /* The no subs event should not be in history but count should increment */ ASSERT_TRUE(!UT_EventIsInHistory(CFE_SB_SEND_NO_SUBS_EID)); @@ -3893,7 +3922,7 @@ void Test_SB_SendMsgPaths_Nominal(void) CFE_SB.HKTlmMsg.Payload.MsgSendErrorCounter = 0; CFE_SB.StopRecurseFlags[1] |= CFE_BIT(CFE_SB_GET_BUF_ERR_EID_BIT); - /* For internal SendMsg call */ + /* For internal send message call */ MsgId = CFE_SB_ValueToMsgId(CFE_SB_HK_TLM_MID); Size = sizeof(CFE_SB.HKTlmMsg); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); @@ -3904,7 +3933,7 @@ void Test_SB_SendMsgPaths_Nominal(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDeferredRetcode(UT_KEY(CFE_ES_GetPoolBuf), 1, CFE_ES_ERR_MEM_BLOCK_SIZE); - CFE_SB_ProcessCmdPipePkt(); + CFE_SB_ProcessCmdPipePkt(&Housekeeping.SBBuf); ASSERT_EQ(CFE_SB.HKTlmMsg.Payload.MsgSendErrorCounter, 0); ASSERT_TRUE(!UT_EventIsInHistory(CFE_SB_GET_BUF_ERR_EID)); @@ -3927,19 +3956,18 @@ void Test_SB_SendMsgPaths_Nominal(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); EVTCNT(3); TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SB_SendMsgPaths */ +} /* end Test_SB_TransmitMsgPaths */ -void Test_SB_SendMsgPaths_LimitErr(void) +void Test_SB_TransmitMsgPaths_LimitErr(void) { CFE_SB_MsgId_t MsgId; CFE_SB_PipeId_t PipeId; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; int32 PipeDepth = 2; CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; CFE_MSG_Size_t Size = sizeof(TlmPkt); @@ -3956,29 +3984,28 @@ void Test_SB_SendMsgPaths_LimitErr(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* First send should pass */ - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); CFE_SB.StopRecurseFlags[1] |= CFE_BIT(CFE_SB_MSGID_LIM_ERR_EID_BIT); - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); CFE_SB.StopRecurseFlags[1] = 0; ASSERT_TRUE(!UT_EventIsInHistory(CFE_SB_MSGID_LIM_ERR_EID)); TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SB_SendMsgPaths */ +} /* end Test_SB_TransmitMsgPaths */ -void Test_SB_SendMsgPaths_FullErr(void) +void Test_SB_TransmitMsgPaths_FullErr(void) { CFE_SB_MsgId_t MsgId; CFE_SB_PipeId_t PipeId; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; int32 PipeDepth = 2; CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; CFE_MSG_Size_t Size = sizeof(TlmPkt); @@ -3993,7 +4020,7 @@ void Test_SB_SendMsgPaths_FullErr(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* This send should pass */ - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); @@ -4002,7 +4029,7 @@ void Test_SB_SendMsgPaths_FullErr(void) /* Tell the QueuePut stub to return OS_QUEUE_FULL on its next call */ UT_SetDeferredRetcode(UT_KEY(OS_QueuePut), 1, OS_QUEUE_FULL); CFE_SB.StopRecurseFlags[1] |= CFE_BIT(CFE_SB_Q_FULL_ERR_EID_BIT); - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); CFE_SB.StopRecurseFlags[1] = 0; ASSERT_TRUE(!UT_EventIsInHistory(CFE_SB_Q_FULL_ERR_EID_BIT)); @@ -4010,14 +4037,13 @@ void Test_SB_SendMsgPaths_FullErr(void) EVTCNT(3); TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SB_SendMsgPaths */ +} /* end Test_SB_TransmitMsgPaths */ -void Test_SB_SendMsgPaths_WriteErr(void) +void Test_SB_TransmitMsgPaths_WriteErr(void) { CFE_SB_MsgId_t MsgId; CFE_SB_PipeId_t PipeId; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; int32 PipeDepth = 2; CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; CFE_MSG_Size_t Size = sizeof(TlmPkt); @@ -4033,14 +4059,14 @@ void Test_SB_SendMsgPaths_WriteErr(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); CFE_SB.StopRecurseFlags[1] |= CFE_BIT(CFE_SB_Q_WR_ERR_EID_BIT); - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); CFE_SB.StopRecurseFlags[1] = 0; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); EVTCNT(3); @@ -4048,14 +4074,13 @@ void Test_SB_SendMsgPaths_WriteErr(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SB_SendMsgPaths */ +} /* end Test_SB_TransmitMsgPaths */ -void Test_SB_SendMsgPaths_IgnoreOpt(void) +void Test_SB_TransmitMsgPaths_IgnoreOpt(void) { CFE_SB_MsgId_t MsgId; CFE_SB_PipeId_t PipeId; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; int32 PipeDepth = 2; CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; CFE_MSG_Size_t Size = sizeof(TlmPkt); @@ -4071,41 +4096,40 @@ void Test_SB_SendMsgPaths_IgnoreOpt(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); /* Test skipping this pipe and the send should pass */ - ASSERT(CFE_SB_SendMsg(TlmPktPtr)); + ASSERT(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); TEARDOWN(CFE_SB_SetPipeOpts(PipeId, 0)); TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_SB_SendMsgPaths */ +} /* end Test_SB_TransmitMsgPaths */ /* ** Test receiving a message response to a unsubscribing to message, then ** resubscribing to it while it's in the pipe */ -void Test_RcvMsg_UnsubResubPath(void) +void Test_ReceiveBuffer_UnsubResubPath(void) { - CFE_MSG_Message_t *PtrToMsg; + CFE_SB_Buffer_t *SBBufPtr; CFE_SB_MsgId_t MsgId = SB_UT_TLM_MID; CFE_SB_PipeId_t PipeId; SB_UT_Test_Tlm_t TlmPkt; - CFE_MSG_Message_t *TlmPktPtr = (CFE_MSG_Message_t *) &TlmPkt; uint32 PipeDepth = 10; CFE_MSG_Type_t Type = CFE_MSG_Type_Tlm; CFE_MSG_Size_t Size = sizeof(TlmPkt); - SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvMsgTestPipe")); + SETUP(CFE_SB_CreatePipe(&PipeId, PipeDepth, "RcvTestPipe")); SETUP(CFE_SB_Subscribe(MsgId, PipeId)); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &MsgId, sizeof(MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetType), &Type, sizeof(Type), false); - SETUP(CFE_SB_SendMsg(TlmPktPtr)); + SETUP(CFE_SB_TransmitMsg(&TlmPkt.Hdr.Msg, true)); SETUP(CFE_SB_Unsubscribe(MsgId, PipeId)); SETUP(CFE_SB_Subscribe(MsgId, PipeId)); - ASSERT(CFE_SB_RcvMsg(&PtrToMsg, PipeId, CFE_SB_PEND_FOREVER)); + ASSERT(CFE_SB_ReceiveBuffer(&SBBufPtr, PipeId, CFE_SB_PEND_FOREVER)); - ASSERT_TRUE(PtrToMsg != NULL); + ASSERT_TRUE(SBBufPtr != NULL); EVTCNT(6); @@ -4113,7 +4137,7 @@ void Test_RcvMsg_UnsubResubPath(void) TEARDOWN(CFE_SB_DeletePipe(PipeId)); -} /* end Test_RcvMsg_UnsubResubPath */ +} /* end Test_ReceiveBuffer_UnsubResubPath */ /* ** Test the paths through the MessageStringSet and MessageStringGet functions diff --git a/fsw/cfe-core/unit-test/sb_UT.h b/fsw/cfe-core/unit-test/sb_UT.h index ffb126684..1420e762a 100644 --- a/fsw/cfe-core/unit-test/sb_UT.h +++ b/fsw/cfe-core/unit-test/sb_UT.h @@ -52,34 +52,34 @@ ** Structures */ typedef struct { - CFE_SB_CmdHdr_t Hdr; - uint32 Cmd32Param1; - uint16 Cmd16Param1; - uint16 Cmd16Param2; - uint8 Cmd8Param1; - uint8 Cmd8Param2; - uint8 Cmd8Param3; - uint8 Cmd8Param4; + CFE_MSG_CommandHeader_t Hdr; + uint32 Cmd32Param1; + uint16 Cmd16Param1; + uint16 Cmd16Param2; + uint8 Cmd8Param1; + uint8 Cmd8Param2; + uint8 Cmd8Param3; + uint8 Cmd8Param4; } SB_UT_Test_Cmd_t; typedef struct { - CFE_SB_TlmHdr_t Hdr; - uint32 Tlm32Param1; - uint16 Tlm16Param1; - uint16 Tlm16Param2; - uint8 Tlm8Param1; - uint8 Tlm8Param2; - uint8 Tlm8Param3; - uint8 Tlm8Param4; + CFE_MSG_TelemetryHeader_t Hdr; + uint32 Tlm32Param1; + uint16 Tlm16Param1; + uint16 Tlm16Param2; + uint8 Tlm8Param1; + uint8 Tlm8Param2; + uint8 Tlm8Param3; + uint8 Tlm8Param4; } SB_UT_Test_Tlm_t; typedef struct { - CFE_MSG_Message_t Pri; /* 6 bytes */ - uint8 Tlm8Param1; - uint8 Tlm8Param2; - uint32 Tlm32Param1; - uint16 Tlm16Param1; - uint16 Tlm16Param2; + CFE_MSG_Message_t Pri; + uint8 Tlm8Param1; + uint8 Tlm8Param2; + uint32 Tlm32Param1; + uint16 Tlm16Param1; + uint16 Tlm16Param2; } SB_UT_TstPktWoSecHdr_t; #define SB_UT_CMD_MID_VALUE_BASE CFE_PLATFORM_CMD_MID_BASE + 1 @@ -1860,7 +1860,7 @@ void Test_Unsubscribe_GetDestPtr(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_API(void); +void Test_TransmitMsg_API(void); /*****************************************************************************/ /** @@ -1876,7 +1876,7 @@ void Test_SendMsg_API(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_NullPtr(void); +void Test_TransmitMsg_NullPtr(void); /*****************************************************************************/ /** @@ -1892,7 +1892,7 @@ void Test_SendMsg_NullPtr(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_InvalidMsgId(void); +void Test_TransmitMsg_InvalidMsgId(void); /*****************************************************************************/ /** @@ -1908,7 +1908,7 @@ void Test_SendMsg_InvalidMsgId(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_NoSubscribers(void); +void Test_TransmitMsg_NoSubscribers(void); /*****************************************************************************/ /** @@ -1925,7 +1925,7 @@ void Test_SendMsg_NoSubscribers(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_MaxMsgSizePlusOne(void); +void Test_TransmitMsg_MaxMsgSizePlusOne(void); /*****************************************************************************/ /** @@ -1941,7 +1941,7 @@ void Test_SendMsg_MaxMsgSizePlusOne(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_BasicSend(void); +void Test_TransmitMsg_BasicSend(void); /*****************************************************************************/ /** @@ -1957,7 +1957,7 @@ void Test_SendMsg_BasicSend(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_SequenceCount(void); +void Test_TransmitMsg_SequenceCount(void); /*****************************************************************************/ /** @@ -1973,7 +1973,7 @@ void Test_SendMsg_SequenceCount(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_QueuePutError(void); +void Test_TransmitMsg_QueuePutError(void); /*****************************************************************************/ /** @@ -1989,7 +1989,7 @@ void Test_SendMsg_QueuePutError(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_PipeFull(void); +void Test_TransmitMsg_PipeFull(void); /*****************************************************************************/ /** @@ -2005,7 +2005,7 @@ void Test_SendMsg_PipeFull(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_MsgLimitExceeded(void); +void Test_TransmitMsg_MsgLimitExceeded(void); /*****************************************************************************/ /** @@ -2021,7 +2021,7 @@ void Test_SendMsg_MsgLimitExceeded(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_GetPoolBufErr(void); +void Test_TransmitMsg_GetPoolBufErr(void); /*****************************************************************************/ /** @@ -2038,7 +2038,7 @@ void Test_SendMsg_GetPoolBufErr(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_ZeroCopyGetPtr(void); +void Test_TransmitMsg_ZeroCopyGetPtr(void); /*****************************************************************************/ /** @@ -2055,7 +2055,7 @@ void Test_SendMsg_ZeroCopyGetPtr(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_ZeroCopySend(void); +void Test_TransmitBuffer_IncrementSeqCnt(void); /*****************************************************************************/ /** @@ -2072,7 +2072,7 @@ void Test_SendMsg_ZeroCopySend(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_ZeroCopyPass(void); +void Test_TransmitBuffer_NoIncrement(void); /*****************************************************************************/ /** @@ -2088,7 +2088,7 @@ void Test_SendMsg_ZeroCopyPass(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_ZeroCopyReleasePtr(void); +void Test_TransmitMsg_ZeroCopyReleasePtr(void); /*****************************************************************************/ /** @@ -2104,11 +2104,11 @@ void Test_SendMsg_ZeroCopyReleasePtr(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_DisabledDestination(void); +void Test_TransmitMsg_DisabledDestination(void); /*****************************************************************************/ /** -** \brief Test successfully sending a message with the metadata +** \brief Test successful CFE_SB_TransmitBufferFull ** ** \par Description ** This function tests successfully sending a message with the metadata. @@ -2119,29 +2119,11 @@ void Test_SendMsg_DisabledDestination(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_SendWithMetadata(void); +void Test_TransmitBufferFull(void); /*****************************************************************************/ /** -** \brief Test response to sending a message with an invalid ID and ZeroCopy is -** set -** -** \par Description -** This function tests the response to sending a message with an invalid -** ID. -** -** \par Assumptions, External Events, and Notes: -** None -** -** \returns -** This function does not return a value. -******************************************************************************/ -void Test_SendMsg_InvalidMsgId_ZeroCopy(void); - -/*****************************************************************************/ -/** -** \brief Test response to sending a message which has no subscribers and -** ZeroCopy is set +** \brief Test response to sending a message which has no subscribers ** ** \par Description ** This function tests the response to sending a message which has no @@ -2153,12 +2135,12 @@ void Test_SendMsg_InvalidMsgId_ZeroCopy(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_NoSubscribers_ZeroCopy(void); +void Test_TransmitMsgValidate_NoSubscribers(void); /*****************************************************************************/ /** ** \brief Test response to sending a message with the message size larger -** than allowed and ZeroCopy is set +** than allowed ** ** \par Description ** This function tests the response to sending a message with the @@ -2170,7 +2152,7 @@ void Test_SendMsg_NoSubscribers_ZeroCopy(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SendMsg_MaxMsgSizePlusOne_ZeroCopy(void); +void Test_TransmitMsgValidate_MaxMsgSizePlusOne(void); /*****************************************************************************/ /** @@ -2185,7 +2167,7 @@ void Test_SendMsg_MaxMsgSizePlusOne_ZeroCopy(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_RcvMsg_API(void); +void Test_ReceiveBuffer_API(void); /*****************************************************************************/ /** @@ -2202,7 +2184,7 @@ void Test_RcvMsg_API(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_RcvMsg_InvalidPipeId(void); +void Test_ReceiveBuffer_InvalidPipeId(void); /*****************************************************************************/ /** @@ -2218,7 +2200,7 @@ void Test_RcvMsg_InvalidPipeId(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_RcvMsg_InvalidTimeout(void); +void Test_ReceiveBuffer_InvalidTimeout(void); /*****************************************************************************/ /** @@ -2235,7 +2217,7 @@ void Test_RcvMsg_InvalidTimeout(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_RcvMsg_Poll(void); +void Test_ReceiveBuffer_Poll(void); /*****************************************************************************/ /** @@ -2250,7 +2232,7 @@ void Test_RcvMsg_Poll(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_RcvMsg_Timeout(void); +void Test_ReceiveBuffer_Timeout(void); /*****************************************************************************/ /** @@ -2266,7 +2248,7 @@ void Test_RcvMsg_Timeout(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_RcvMsg_PipeReadError(void); +void Test_ReceiveBuffer_PipeReadError(void); /*****************************************************************************/ /** @@ -2282,7 +2264,7 @@ void Test_RcvMsg_PipeReadError(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_RcvMsg_PendForever(void); +void Test_ReceiveBuffer_PendForever(void); /*****************************************************************************/ /** @@ -2298,7 +2280,7 @@ void Test_RcvMsg_PendForever(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_RcvMsg_InvalidBufferPtr(void); +void Test_ReceiveBuffer_InvalidBufferPtr(void); /*****************************************************************************/ /** @@ -2508,10 +2490,10 @@ void Test_CFE_SB_BadPipeInfo(void); /*****************************************************************************/ /** -** \brief Test SendMsgFull function paths +** \brief Test TransmitMsgFull function paths ** ** \par Description -** This function tests branch paths in the SendMsgFull function. +** This function tests branch paths in the TransmitMsgFull function. ** ** \par Assumptions, External Events, and Notes: ** None @@ -2519,18 +2501,18 @@ void Test_CFE_SB_BadPipeInfo(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_SB_SendMsgPaths_Nominal(void); -void Test_SB_SendMsgPaths_LimitErr(void); -void Test_SB_SendMsgPaths_FullErr(void); -void Test_SB_SendMsgPaths_WriteErr(void); -void Test_SB_SendMsgPaths_IgnoreOpt(void); +void Test_SB_TransmitMsgPaths_Nominal(void); +void Test_SB_TransmitMsgPaths_LimitErr(void); +void Test_SB_TransmitMsgPaths_FullErr(void); +void Test_SB_TransmitMsgPaths_WriteErr(void); +void Test_SB_TransmitMsgPaths_IgnoreOpt(void); /*****************************************************************************/ /** -** \brief Test RcvMsg function unsubscribe/resubscribe path +** \brief Test ReceiveBuffer function unsubscribe/resubscribe path ** ** \par Description -** This function tests the branch path in the RcvMsg function when a +** This function tests the branch path in the ReceiveBuffer function when a ** message in the pipe is unsubscribed, then resubscribed. ** ** \par Assumptions, External Events, and Notes: @@ -2539,7 +2521,7 @@ void Test_SB_SendMsgPaths_IgnoreOpt(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void Test_RcvMsg_UnsubResubPath(void); +void Test_ReceiveBuffer_UnsubResubPath(void); /*****************************************************************************/ /** diff --git a/fsw/cfe-core/unit-test/tbl_UT.c b/fsw/cfe-core/unit-test/tbl_UT.c index 7f6baa51c..65b107deb 100644 --- a/fsw/cfe-core/unit-test/tbl_UT.c +++ b/fsw/cfe-core/unit-test/tbl_UT.c @@ -455,8 +455,8 @@ void Test_CFE_TBL_SearchCmdHndlrTbl(void) */ void Test_CFE_TBL_DeleteCDSCmd(void) { - int j, k; - CFE_TBL_DeleteCDS_t DelCDSCmd; + int j, k; + CFE_TBL_DeleteCDSCmd_t DelCDSCmd; UtPrintf("Begin Test Delete CDS Command"); @@ -544,7 +544,7 @@ void Test_CFE_TBL_DeleteCDSCmd(void) */ void Test_CFE_TBL_TlmRegCmd(void) { - CFE_TBL_SendRegistry_t TlmRegCmd; + CFE_TBL_SendRegistryCmd_t TlmRegCmd; UtPrintf("Begin Test Telemetry Registry Command"); @@ -579,8 +579,8 @@ void Test_CFE_TBL_TlmRegCmd(void) */ void Test_CFE_TBL_AbortLoadCmd(void) { - int load = (int) CFE_TBL_TaskData.Registry[0].LoadInProgress; - CFE_TBL_AbortLoad_t AbortLdCmd; + int load = (int) CFE_TBL_TaskData.Registry[0].LoadInProgress; + CFE_TBL_AbortLoadCmd_t AbortLdCmd; UtPrintf("Begin Test Abort Load Command"); @@ -652,7 +652,7 @@ void Test_CFE_TBL_ActivateCmd(void) { int load = (int) CFE_TBL_TaskData.Registry[0].LoadInProgress; uint8 dump = CFE_TBL_TaskData.Registry[0].DumpOnly; - CFE_TBL_Activate_t ActivateCmd; + CFE_TBL_ActivateCmd_t ActivateCmd; UtPrintf("Begin Test Activate Command"); @@ -715,7 +715,7 @@ void Test_CFE_TBL_ActivateCmd(void) * progress, and a notification message should be sent */ UT_InitData(); - UT_SetDeferredRetcode(UT_KEY(CFE_SB_SendMsg), 1, CFE_SB_INTERNAL_ERR); + UT_SetDeferredRetcode(UT_KEY(CFE_SB_TransmitMsg), 1, CFE_SB_INTERNAL_ERR); CFE_TBL_TaskData.Registry[0].NotifyByMsg = true; CFE_TBL_TaskData.Registry[0].LoadInProgress = CFE_TBL_NO_LOAD_IN_PROGRESS + 1; UT_Report(__FILE__, __LINE__, @@ -831,7 +831,7 @@ void Test_CFE_TBL_ValidateCmd(void) int i; uint8 Buff; uint8 *BuffPtr = &Buff; - CFE_TBL_Validate_t ValidateCmd; + CFE_TBL_ValidateCmd_t ValidateCmd; CFE_TBL_CallbackFuncPtr_t ValFuncPtr = (CFE_TBL_CallbackFuncPtr_t) ((unsigned long ) &UT_InitializeTableRegistryNames); @@ -937,7 +937,7 @@ void Test_CFE_TBL_ValidateCmd(void) * notification message should be sent */ UT_InitData(); - UT_SetDeferredRetcode(UT_KEY(CFE_SB_SendMsg), 1, CFE_SB_INTERNAL_ERR); + UT_SetDeferredRetcode(UT_KEY(CFE_SB_TransmitMsg), 1, CFE_SB_INTERNAL_ERR); CFE_TBL_TaskData.Registry[0].NotifyByMsg = true; CFE_TBL_TaskData.Registry[0].DoubleBuffered = false; CFE_TBL_TaskData.LoadBuffs[CFE_TBL_TaskData.Registry[0].LoadInProgress].BufferPtr = BuffPtr; @@ -1135,9 +1135,9 @@ void Test_CFE_TBL_GetHkData(void) */ void Test_CFE_TBL_DumpRegCmd(void) { - int q; - CFE_TBL_DumpRegistry_t DumpRegCmd; - CFE_ES_ResourceID_t AppID; + int q; + CFE_TBL_DumpRegistryCmd_t DumpRegCmd; + CFE_ES_ResourceID_t AppID; /* Get the AppID being used for UT */ CFE_ES_GetAppID(&AppID); @@ -1228,11 +1228,11 @@ void Test_CFE_TBL_DumpRegCmd(void) */ void Test_CFE_TBL_DumpCmd(void) { - int i, k, u; - uint8 Buff; + int i, k, u; + uint8 Buff; uint8 *BuffPtr = &Buff; - CFE_TBL_LoadBuff_t Load = {0}; - CFE_TBL_Dump_t DumpCmd; + CFE_TBL_LoadBuff_t Load = {0}; + CFE_TBL_DumpCmd_t DumpCmd; CFE_ES_ResourceID_t AppID; CFE_ES_GetAppID(&AppID); @@ -1277,7 +1277,7 @@ void Test_CFE_TBL_DumpCmd(void) CFE_TBL_TaskData.Registry[2].DoubleBuffered = false; CFE_TBL_TaskData.LoadBuffs[CFE_TBL_TaskData.Registry[2].LoadInProgress] = Load; CFE_TBL_TaskData.Registry[2].NotifyByMsg = true; - UT_SetDeferredRetcode(UT_KEY(CFE_SB_SendMsg), 1, CFE_SB_INTERNAL_ERR); + UT_SetDeferredRetcode(UT_KEY(CFE_SB_TransmitMsg), 1, CFE_SB_INTERNAL_ERR); UT_Report(__FILE__, __LINE__, CFE_TBL_DumpCmd(&DumpCmd) == CFE_TBL_INC_CMD_CTR, @@ -1406,11 +1406,11 @@ void Test_CFE_TBL_DumpCmd(void) */ void Test_CFE_TBL_LoadCmd(void) { - int i, j; - CFE_TBL_File_Hdr_t TblFileHeader; - CFE_FS_Header_t StdFileHeader; - CFE_TBL_LoadBuff_t BufferPtr = CFE_TBL_TaskData.LoadBuffs[0]; - CFE_TBL_Load_t LoadCmd; + int i, j; + CFE_TBL_File_Hdr_t TblFileHeader; + CFE_FS_Header_t StdFileHeader; + CFE_TBL_LoadBuff_t BufferPtr = CFE_TBL_TaskData.LoadBuffs[0]; + CFE_TBL_LoadCmd_t LoadCmd; CFE_ES_ResourceID_t AppID; CFE_ES_GetAppID(&AppID); @@ -1686,7 +1686,7 @@ void Test_CFE_TBL_HousekeepingCmd(void) CFE_TBL_TaskData.DumpControlBlocks[i].State = CFE_TBL_DUMP_PENDING; } - UT_SetDeferredRetcode(UT_KEY(CFE_SB_SendMsg), 1, CFE_SUCCESS - 1); + UT_SetDeferredRetcode(UT_KEY(CFE_SB_TransmitMsg), 1, CFE_SUCCESS - 1); CFE_TBL_TaskData.HkTlmTblRegIndex = CFE_TBL_NOT_FOUND + 1; UT_Report(__FILE__, __LINE__, CFE_TBL_HousekeepingCmd(NULL) == CFE_TBL_DONT_INC_CTR, diff --git a/fsw/cfe-core/unit-test/tbl_UT.h b/fsw/cfe-core/unit-test/tbl_UT.h index b8044c0da..2b8884b5f 100644 --- a/fsw/cfe-core/unit-test/tbl_UT.h +++ b/fsw/cfe-core/unit-test/tbl_UT.h @@ -74,7 +74,7 @@ typedef struct /*****************************************************************************/ /** -** \brief Initialize the registry +** \brief Initialize the registry names ** ** \par Description ** Fill the whole table registry with known table names in order to @@ -86,7 +86,6 @@ typedef struct ** ** \returns ** This function does not return a value. -** ******************************************************************************/ void UT_InitializeTableRegistryNames(void); @@ -94,15 +93,6 @@ void UT_InitializeTableRegistryNames(void); /** ** \brief Initialize table registry values ** -** \par Description -** This function serves as a pass-through for messages coming from the -** CFE_SB_SendMsg() stub function. By using a common pass-through -** function name, the stub can be generic for all of the tests for the -** various services (i.e., EVS, TBL, etc.). -** -** \par Assumptions, External Events, and Notes: -** None -** ** \returns ** This function does not return a value. ******************************************************************************/ diff --git a/fsw/cfe-core/unit-test/time_UT.c b/fsw/cfe-core/unit-test/time_UT.c index 211999e51..16c7a9772 100644 --- a/fsw/cfe-core/unit-test/time_UT.c +++ b/fsw/cfe-core/unit-test/time_UT.c @@ -1741,24 +1741,24 @@ void Test_PipeCmds(void) union { CFE_MSG_Message_t message; - CFE_SB_CmdHdr_t cmd; + CFE_MSG_CommandHeader_t cmd; CFE_TIME_ToneDataCmd_t tonedatacmd; - CFE_TIME_Noop_t noopcmd; - CFE_TIME_ResetCounters_t resetcountercmd; - CFE_TIME_SendDiagnosticTlm_t diagtlmcmd; - CFE_TIME_SetState_t statecmd; - CFE_TIME_SetSource_t sourcecmd; - CFE_TIME_SetSignal_t signalcmd; - CFE_TIME_AddDelay_t adddelaycmd; - CFE_TIME_SubDelay_t subdelaycmd; - CFE_TIME_SetTime_t settimecmd; - CFE_TIME_SetMET_t setmetcmd; - CFE_TIME_SetSTCF_t setstcfcmd; - CFE_TIME_SetLeapSeconds_t leapscmd; - CFE_TIME_AddAdjust_t addadjcmd; - CFE_TIME_SubAdjust_t subadjcmd; - CFE_TIME_Add1HZAdjustment_t add1hzadjcmd; - CFE_TIME_Sub1HZAdjustment_t sub1hzadjcmd; + CFE_TIME_NoopCmd_t noopcmd; + CFE_TIME_ResetCountersCmd_t resetcountercmd; + CFE_TIME_SendDiagnosticCmd_t diagtlmcmd; + CFE_TIME_SetStateCmd_t statecmd; + CFE_TIME_SetSourceCmd_t sourcecmd; + CFE_TIME_SetSignalCmd_t signalcmd; + CFE_TIME_AddDelayCmd_t adddelaycmd; + CFE_TIME_SubDelayCmd_t subdelaycmd; + CFE_TIME_SetTimeCmd_t settimecmd; + CFE_TIME_SetMETCmd_t setmetcmd; + CFE_TIME_SetSTCFCmd_t setstcfcmd; + CFE_TIME_SetLeapSecondsCmd_t leapscmd; + CFE_TIME_AddAdjustCmd_t addadjcmd; + CFE_TIME_SubAdjustCmd_t subadjcmd; + CFE_TIME_Add1HZAdjustmentCmd_t add1hzadjcmd; + CFE_TIME_Sub1HZAdjustmentCmd_t sub1hzadjcmd; } CmdBuf; UT_SoftwareBusSnapshot_Entry_t LocalSnapshotData = @@ -1776,7 +1776,7 @@ void Test_PipeCmds(void) /* Test sending the housekeeping telemetry request command */ UT_InitData(); - UT_SetHookFunction(UT_KEY(CFE_SB_SendMsg), UT_SoftwareBusSnapshotHook, &LocalSnapshotData); + UT_SetHookFunction(UT_KEY(CFE_SB_TransmitMsg), UT_SoftwareBusSnapshotHook, &LocalSnapshotData); UT_CallTaskPipe(CFE_TIME_TaskPipe, &CmdBuf.message, sizeof(CmdBuf.cmd), UT_TPID_CFE_TIME_SEND_HK); UT_Report(__FILE__, __LINE__, diff --git a/fsw/cfe-core/unit-test/time_UT.h b/fsw/cfe-core/unit-test/time_UT.h index e55170d13..c6300c762 100644 --- a/fsw/cfe-core/unit-test/time_UT.h +++ b/fsw/cfe-core/unit-test/time_UT.h @@ -66,9 +66,6 @@ ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, CFE_TIME_TaskMain, #UT_Report, #UT_SetRtnCode -** ******************************************************************************/ void Test_Main(void); @@ -86,10 +83,6 @@ void Test_Main(void); ** ** \returns ** This function does not return a value. -** -** \sa #CFE_TIME_EarlyInit, #UT_InitData, #UT_Report, -** \sa #CFE_TIME_TaskInit, #UT_SetRtnCode -** ******************************************************************************/ void Test_Init(void); @@ -105,13 +98,6 @@ void Test_Init(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetBSP_Time, #CFE_TIME_Print, -** \sa #CFE_TIME_GetMET, #UT_Report, #CFE_TIME_GetMETseconds, -** \sa #CFE_TIME_GetMETsubsecs, #CFE_TIME_Micro2SubSecs, -** \sa #CFE_TIME_GetLeapSeconds, #CFE_TIME_GetTAI, #CFE_TIME_GetUTC, -** \sa #CFE_TIME_GetSTCF, #CFE_TIME_GetClockState, #CFE_TIME_GetClockInfo -** ******************************************************************************/ void Test_GetTime(void); @@ -127,10 +113,6 @@ void Test_GetTime(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TIME_Add, #UT_Report, #CFE_TIME_Subtract, -** \sa #CFE_TIME_Compare -** ******************************************************************************/ void Test_TimeOp(void); @@ -146,10 +128,6 @@ void Test_TimeOp(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TIME_Print, #CFE_TIME_MET2SCTime, -** \sa #UT_Report, #CFE_TIME_Sub2MicroSecs, #CFE_TIME_Micro2SubSecs -** ******************************************************************************/ void Test_ConvertTime(void); @@ -167,9 +145,6 @@ void Test_ConvertTime(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TIME_Print, #UT_Report -** ******************************************************************************/ void Test_Print(void); @@ -187,7 +162,6 @@ void Test_Print(void); ** ** \returns ** This function returns CFE_SUCCESS -** ******************************************************************************/ int32 ut_time_MyCallbackFunc(void); @@ -210,9 +184,6 @@ int32 ut_time_MyCallbackFunc(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TIME_RegisterSynchCallback, #UT_Report -** ******************************************************************************/ void Test_RegisterSyncCallback(bool reportResults); @@ -229,9 +200,6 @@ void Test_RegisterSyncCallback(bool reportResults); ** ** \returns ** This function does not return a value. -** -** \sa #Test_RegisterSyncCallback -** ******************************************************************************/ void Test_RegisterSyncCallbackTrue(void); @@ -247,10 +215,6 @@ void Test_RegisterSyncCallbackTrue(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetBSP_Time, #CFE_TIME_ExternalTone, -** \sa #UT_Report -** ******************************************************************************/ void Test_ExternalTone(void); @@ -266,10 +230,6 @@ void Test_ExternalTone(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TIME_ExternalMET, #UT_Report, -** \sa #CFE_TIME_ExternalGPS, #CFE_TIME_ExternalTime -** ******************************************************************************/ void Test_External(void); @@ -285,9 +245,6 @@ void Test_External(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SendMsg, #UT_Report, #UT_SetBSP_Time -** ******************************************************************************/ void Test_PipeCmds(void); @@ -303,10 +260,6 @@ void Test_PipeCmds(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetStatusBSPResetArea, -** \sa #CFE_TIME_QueryResetVars, #CFE_TIME_UpdateResetVars, #UT_Report -** ******************************************************************************/ void Test_ResetArea(void); @@ -322,10 +275,6 @@ void Test_ResetArea(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_Report, #CFE_TIME_CalculateState, -** \sa #CFE_TIME_SetState, #CFE_TIME_GetStateFlags -** ******************************************************************************/ void Test_State(void); @@ -341,10 +290,6 @@ void Test_State(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #UT_SetBSP_Time, #CFE_TIME_GetReference, -** \sa #UT_Report -** ******************************************************************************/ void Test_GetReference(void); @@ -361,10 +306,6 @@ void Test_GetReference(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TIME_SetState, #UT_SetBSP_Time, -** \sa #UT_Report, #CFE_TIME_ToneSend, #CFE_TIME_ToneVerify, CFE_TIME_SetState, -** ******************************************************************************/ void Test_Tone(void); @@ -382,11 +323,6 @@ void Test_Tone(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TIME_Set1HzAdj, #CFE_TIME_Local1HzISR, -** \sa #UT_Report, #UT_SetBSP_Time, #UT_SetBinSemFail, #CFE_TIME_Local1HzTask, -** \sa #CFE_TIME_Tone1HzTask -** ******************************************************************************/ void Test_1Hz(void); @@ -402,9 +338,6 @@ void Test_1Hz(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #CFE_TIME_UnregisterSynchCallback, #UT_Report -** ******************************************************************************/ void Test_UnregisterSynchCallback(void); @@ -420,10 +353,6 @@ void Test_UnregisterSynchCallback(void); ** ** \returns ** This function does not return a value. -** -** \sa #UT_InitData, #Test_RegisterSyncCallback, -** \sa #CFE_TIME_CleanUpApp, #CFE_TIME_UnregisterSynchCallback, #UT_Report -** ******************************************************************************/ void Test_CleanUpApp(void); diff --git a/fsw/cfe-core/unit-test/ut_support.c b/fsw/cfe-core/unit-test/ut_support.c index f1e7c4ceb..011ffd3e4 100644 --- a/fsw/cfe-core/unit-test/ut_support.c +++ b/fsw/cfe-core/unit-test/ut_support.c @@ -151,7 +151,7 @@ void UT_InitData(void) UT_SetCDSSize(UT_LastCDSSize); /* - * Set up for the CFE_SB_RcvMsg() call. + * Set up for the CFE_SB_ReceiveBuffer() call. * * The existing test cases assume that this will return success once, * followed by a timeout response followed by a different error. @@ -159,11 +159,11 @@ void UT_InitData(void) * Specific test cases may provide an actual message buffer to return for * the first call, or they may override this default behavior entirely. * - * The default behavior of the CFE_SB_RcvMsg stub is to return success with a zero-ed out + * The default behavior of the CFE_SB_ReceiveBuffer stub is to return success with a zero-ed out * buffer returned to the caller. */ - UT_SetDeferredRetcode(UT_KEY(CFE_SB_RcvMsg), 2, CFE_SB_TIME_OUT); - UT_SetDeferredRetcode(UT_KEY(CFE_SB_RcvMsg), 3, -1); + UT_SetDeferredRetcode(UT_KEY(CFE_SB_ReceiveBuffer), 2, CFE_SB_TIME_OUT); + UT_SetDeferredRetcode(UT_KEY(CFE_SB_ReceiveBuffer), 3, -1); /* * Set up CFE_ES_GetAppName() and friends @@ -215,9 +215,18 @@ void UT_Report(const char *file, uint32 line, bool test, const char *fun_name, ** This first sets up the various stubs according to the test case, ** then invokes the pipe function. */ -void UT_CallTaskPipe(void (*TaskPipeFunc)(CFE_MSG_Message_t *), CFE_MSG_Message_t *MsgPtr, uint32 MsgSize, +void UT_CallTaskPipe(void (*TaskPipeFunc)(CFE_SB_Buffer_t *), CFE_MSG_Message_t *MsgPtr, size_t MsgSize, UT_TaskPipeDispatchId_t DispatchId) { + union + { + CFE_SB_Buffer_t Buf; + uint8 Bytes[CFE_MISSION_SB_MAX_SB_MSG_SIZE]; + } SBBuf; + + /* Copy message into aligned SB buffer */ + memcpy(SBBuf.Bytes, MsgPtr, MsgSize); + /* Set up for the typical task pipe related calls */ UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &DispatchId.MsgId, sizeof(DispatchId.MsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); @@ -233,7 +242,7 @@ void UT_CallTaskPipe(void (*TaskPipeFunc)(CFE_MSG_Message_t *), CFE_MSG_Message_ /* * Finally, call the actual task pipe requested. */ - TaskPipeFunc(MsgPtr); + TaskPipeFunc(&SBBuf.Buf); } int32 UT_SoftwareBusSnapshotHook(void *UserObj, int32 StubRetcode, uint32 CallCount, const UT_StubContext_t *Context) diff --git a/fsw/cfe-core/unit-test/ut_support.h b/fsw/cfe-core/unit-test/ut_support.h index 43593079f..6878077e5 100644 --- a/fsw/cfe-core/unit-test/ut_support.h +++ b/fsw/cfe-core/unit-test/ut_support.h @@ -280,7 +280,7 @@ void UT_ReportFailures(void); ** \returns ** This function does not return a value. ******************************************************************************/ -void UT_CallTaskPipe(void (*TaskPipeFunc)(CFE_MSG_Message_t*), CFE_MSG_Message_t *MsgPtr, uint32 MsgSize, +void UT_CallTaskPipe(void (*TaskPipeFunc)(CFE_SB_Buffer_t*), CFE_MSG_Message_t *MsgPtr, size_t MsgSize, UT_TaskPipeDispatchId_t DispatchId); /*****************************************************************************/