diff --git a/cmake/sample_defs/cpu1_msgids.h b/cmake/sample_defs/cpu1_msgids.h index 9a2c6c4fe..3e7ebc0bf 100644 --- a/cmake/sample_defs/cpu1_msgids.h +++ b/cmake/sample_defs/cpu1_msgids.h @@ -86,7 +86,11 @@ #define CFE_TBL_REG_TLM_MID CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_TBL_REG_TLM_MSG /* 0x080C */ #define CFE_SB_ALLSUBS_TLM_MID CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_SB_ALLSUBS_TLM_MSG /* 0x080D */ #define CFE_SB_ONESUB_TLM_MID CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_SB_ONESUB_TLM_MSG /* 0x080E */ -#define CFE_ES_SHELL_TLM_MID CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_ES_SHELL_TLM_MSG /* 0x080F */ + +#ifndef CFE_OMIT_DEPRECATED_6_7 + #define CFE_ES_SHELL_TLM_MID CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_ES_SHELL_TLM_MSG /* 0x080F */ +#endif + #define CFE_ES_MEMSTATS_TLM_MID CFE_MISSION_TLM_MID_BASE1 + CFE_MISSION_ES_MEMSTATS_TLM_MSG /* 0x0810 */ /* diff --git a/fsw/cfe-core/src/es/cfe_es_shell.c b/fsw/cfe-core/src/es/cfe_es_shell.c index 72a0ea1bc..5f2b343bb 100644 --- a/fsw/cfe-core/src/es/cfe_es_shell.c +++ b/fsw/cfe-core/src/es/cfe_es_shell.c @@ -44,6 +44,11 @@ #include +#ifndef CFE_OMIT_DEPRECATED_6_7 /* Remove entire file eventually */ +/* Note - Plan to implement the list functions as real commands, + * shell output no longer part of cFS Framework, recommend implementation in an app if needed + */ + #define CFE_ES_CHECKSIZE 3 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* CFE_ES_ShellOutputCommand() -- Pass thru string to O/S shell or to ES */ @@ -424,3 +429,4 @@ int32 CFE_ES_ListResources(int32 fd) */ return Result; } +#endif /* CFE_OMIT_DEPRECATED_6_7 */ diff --git a/fsw/cfe-core/src/es/cfe_es_task.c b/fsw/cfe-core/src/es/cfe_es_task.c index 215aa52a7..478bb0c11 100644 --- a/fsw/cfe-core/src/es/cfe_es_task.c +++ b/fsw/cfe-core/src/es/cfe_es_task.c @@ -248,12 +248,14 @@ int32 CFE_ES_TaskInit(void) CFE_SB_ValueToMsgId(CFE_ES_HK_TLM_MID), sizeof(CFE_ES_TaskData.HkPacket), true); +#ifndef CFE_OMIT_DEPRECATED_6_7 /* ** Initialize shell output packet (clear user data area) */ CFE_SB_InitMsg(&CFE_ES_TaskData.ShellPacket, CFE_SB_ValueToMsgId(CFE_ES_SHELL_TLM_MID), sizeof(CFE_ES_TaskData.ShellPacket), true); +#endif /* ** Initialize single application telemetry packet @@ -465,12 +467,14 @@ void CFE_ES_TaskPipe(CFE_SB_MsgPtr_t Msg) } break; +#ifndef CFE_OMIT_DEPRECATED_6_7 case CFE_ES_SHELL_CC: if (CFE_ES_VerifyCmdLength(Msg, sizeof(CFE_ES_Shell_t))) { CFE_ES_ShellCmd((CFE_ES_Shell_t*)Msg); } break; +#endif case CFE_ES_START_APP_CC: if (CFE_ES_VerifyCmdLength(Msg, sizeof(CFE_ES_StartApp_t))) @@ -832,7 +836,7 @@ int32 CFE_ES_RestartCmd(const CFE_ES_Restart_t *data) return CFE_SUCCESS; } /* End of CFE_ES_RestartCmd() */ - +#ifndef CFE_OMIT_DEPRECATED_6_7 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ /* CFE_ES_ShellCmd() -- Pass thru string to O/S shell */ @@ -877,7 +881,7 @@ int32 CFE_ES_ShellCmd(const CFE_ES_Shell_t *data) return CFE_SUCCESS; } /* End of CFE_ES_ShellCmd() */ - +#endif /* CFE_OMIT_DEPRECATED_6_7 */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* */ diff --git a/fsw/cfe-core/src/es/cfe_es_task.h b/fsw/cfe-core/src/es/cfe_es_task.h index d90a11a42..30e64f4c4 100644 --- a/fsw/cfe-core/src/es/cfe_es_task.h +++ b/fsw/cfe-core/src/es/cfe_es_task.h @@ -77,11 +77,12 @@ typedef struct */ CFE_ES_HousekeepingTlm_t HkPacket; - +#ifndef CFE_OMIT_DEPRECATED_6_7 /* ** ES Shell output telemetry packet */ CFE_ES_ShellTlm_t ShellPacket; +#endif /* ** Single application telemetry packet @@ -152,7 +153,9 @@ int32 CFE_ES_HousekeepingCmd(const CCSDS_CommandPacket_t *data); int32 CFE_ES_NoopCmd(const CFE_ES_Noop_t *Cmd); int32 CFE_ES_ResetCountersCmd(const CFE_ES_ResetCounters_t *data); int32 CFE_ES_RestartCmd(const CFE_ES_Restart_t *data); +#ifndef CFE_OMIT_DEPRECATED_6_7 int32 CFE_ES_ShellCmd(const CFE_ES_Shell_t *data); +#endif int32 CFE_ES_StartAppCmd(const CFE_ES_StartApp_t *data); int32 CFE_ES_StopAppCmd(const CFE_ES_StopApp_t *data); int32 CFE_ES_RestartAppCmd(const CFE_ES_RestartApp_t *data); diff --git a/fsw/cfe-core/src/inc/cfe_es_msg.h b/fsw/cfe-core/src/inc/cfe_es_msg.h index bbd67a208..fe82d51b4 100644 --- a/fsw/cfe-core/src/inc/cfe_es_msg.h +++ b/fsw/cfe-core/src/inc/cfe_es_msg.h @@ -170,7 +170,9 @@ */ #define CFE_ES_RESTART_CC 2 -/** \cfeescmd Executive Services O/S Shell Command +#ifndef CFE_OMIT_DEPRECATED_6_7 +/** \cfeescmd DEPRECATED: Executive Services O/S Shell Command +** \deprecated ** ** \par Description ** This command passes an ASCII string as a command line to the @@ -217,6 +219,7 @@ ** \sa */ #define CFE_ES_SHELL_CC 3 +#endif /* CFE_OMIT_DEPRECATED_6_7 */ /** \cfeescmd Load and Start an Application ** @@ -1152,8 +1155,10 @@ typedef struct CFE_ES_RestartCmd_Payload_t Payload; } CFE_ES_Restart_t; +#ifndef CFE_OMIT_DEPRECATED_6_7 /** -** \brief Shell Command +** \brief DEPRECATED: Shell Command +** \deprecated ** ** For command details, see #CFE_ES_SHELL_CC ** @@ -1166,11 +1171,16 @@ typedef struct be written */ } CFE_ES_ShellCmd_Payload_t; +/** + * \deprecated + */ typedef struct { uint8 CmdHeader[CFE_SB_CMD_HDR_SIZE]; /**< \brief cFE Software Bus Command Message Header */ CFE_ES_ShellCmd_Payload_t Payload; } CFE_ES_Shell_t; +#endif /* CFE_OMIT_DEPRECATED_6_7 */ + /** ** \brief Payload format for commands which accept a single file name @@ -1575,8 +1585,10 @@ typedef struct } CFE_ES_HousekeepingTlm_t; +#ifndef CFE_OMIT_DEPRECATED_6_7 /** -** \cfeestlm OS Shell Output Packet +** \cfeestlm DEPRECATED: OS Shell Output Packet +** \deprecated **/ typedef struct { @@ -1584,11 +1596,15 @@ typedef struct that was received in response to an OS Shell Command */ } CFE_ES_ShellPacket_Payload_t; +/** + * \deprecated + */ typedef struct { uint8 TlmHeader[CFE_SB_TLM_HDR_SIZE]; /**< \brief cFE Software Bus Telemetry Message Header */ CFE_ES_ShellPacket_Payload_t Payload; }CFE_ES_ShellTlm_t; +#endif /* CFE_OMIT_DEPRECATED_6_7 */ /*************************************************************************/ diff --git a/fsw/cfe-core/unit-test/es_UT.c b/fsw/cfe-core/unit-test/es_UT.c index 1963ded0d..b1ab5f08f 100644 --- a/fsw/cfe-core/unit-test/es_UT.c +++ b/fsw/cfe-core/unit-test/es_UT.c @@ -84,11 +84,6 @@ static const UT_TaskPipeDispatchId_t UT_TPID_CFE_ES_CMD_RESTART_CC = .CommandCode = CFE_ES_RESTART_CC }; -static const UT_TaskPipeDispatchId_t UT_TPID_CFE_ES_CMD_SHELL_CC = -{ - .MsgId = CFE_SB_MSGID_WRAP_VALUE(CFE_ES_CMD_MID), - .CommandCode = CFE_ES_SHELL_CC -}; static const UT_TaskPipeDispatchId_t UT_TPID_CFE_ES_CMD_START_APP_CC = { .MsgId = CFE_SB_MSGID_WRAP_VALUE(CFE_ES_CMD_MID), @@ -286,7 +281,6 @@ void UtTest_Setup(void) UT_ADD_TEST(TestStartupErrorPaths); UT_ADD_TEST(TestApps); UT_ADD_TEST(TestERLog); - UT_ADD_TEST(TestShell); UT_ADD_TEST(TestTask); UT_ADD_TEST(TestPerf); UT_ADD_TEST(TestAPI); @@ -2121,66 +2115,6 @@ void TestApps(void) CFE_ES_ListResourcesDebug() == CFE_SUCCESS, "CFE_ES_ListResourcesDebug", "Get OS information failures"); - - /* Fail the first time, then succeed on the second in order to test - * both paths - */ - UT_SetDeferredRetcode(UT_KEY(OS_MutSemGetInfo), 1, OS_ERROR); - UT_SetDeferredRetcode(UT_KEY(OS_BinSemGetInfo), 1, OS_ERROR); - UT_SetDeferredRetcode(UT_KEY(OS_CountSemGetInfo), 1, OS_ERROR); - UT_SetDeferredRetcode(UT_KEY(OS_TaskGetInfo), 1, OS_ERROR); - UT_SetDeferredRetcode(UT_KEY(OS_QueueGetInfo), 1, OS_ERROR); - UT_SetDeferredRetcode(UT_KEY(OS_TimerGetInfo), 1, OS_ERROR); - UT_SetDeferredRetcode(UT_KEY(OS_FDGetInfo), 1, OS_ERROR); - UT_SetDeferredRetcode(UT_KEY(OS_write), 1, OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ListResources(0) == OS_ERROR, - "CFE_ES_ListResources", - "Get task info failed"); - - /* Fail the file write the second time in order to test the second path */ - UT_SetDeferredRetcode(UT_KEY(OS_write), 2, OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ListResources(0) == OS_ERROR, - "CFE_ES_ListResources", - "File write failed (second path)"); - - /* Fail the file write the third time in order to test the third path */ - UT_SetDeferredRetcode(UT_KEY(OS_write), 3, OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ListResources(0) == OS_ERROR, - "CFE_ES_ListResources", - "File write failed (third path)"); - - /* Fail the file write the fourth time in order to test the fourth path */ - UT_SetDeferredRetcode(UT_KEY(OS_write), 4, OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ListResources(0) == OS_ERROR, - "CFE_ES_ListResources", - "File write failed (fourth path)"); - - /* Fail the file write the fifth time in order to test the fifth path */ - UT_SetDeferredRetcode(UT_KEY(OS_write), 5, OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ListResources(0) == OS_ERROR, - "CFE_ES_ListResources", - "File write failed (fifth path)"); - - /* Fail the file write the sixth time in order to test the sixth path */ - UT_SetDeferredRetcode(UT_KEY(OS_write), 6, OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ListResources(0) == OS_ERROR, - "CFE_ES_ListResources", - "File write failed (sixth path)"); - - /* Fail the file write the seventh time in order to test the seventh - * path - */ - UT_SetDeferredRetcode(UT_KEY(OS_write), 7, OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ListResources(0) == OS_ERROR, - "CFE_ES_ListResources", - "File write failed (seventh path)"); } void TestERLog(void) @@ -2280,181 +2214,6 @@ void TestERLog(void) "No log entry rollover; no description; no context"); } -void TestShell(void) -{ - uint32 Id, Id2; - uint32 TestObjId, TestObjId2; - -#ifdef UT_VERBOSE - UT_Text("Begin Test Shell Command\n"); -#endif - - /* Test shell output command using a non-existent ES command */ - ES_ResetUnitTest(); - UT_Report(__FILE__, __LINE__, - CFE_ES_ShellOutputCommand("ES_NoSuchThing", - "./FS_Test_File_Name") == - CFE_ES_ERR_SHELL_CMD, - "CFE_ES_ShellOutputCommand", - "Invalid ES command"); - - /* Test shell output command using a valid OS command */ - ES_ResetUnitTest(); - UT_Report(__FILE__, __LINE__, - CFE_ES_ShellOutputCommand("ls", "") == CFE_SUCCESS, - "CFE_ES_ShellOutputCommand", - "Send OS command"); - - /* Test shell output command using an ES list applications command */ - ES_ResetUnitTest(); - OS_TaskCreate(&TestObjId, "UT", NULL, NULL, 0, 0, 0); - Id = ES_UT_OSALID_TO_ARRAYIDX(TestObjId); - CFE_ES_Global.TaskTable[Id].TaskId = TestObjId; - CFE_ES_Global.TaskTable[Id].RecordUsed = true; - CFE_ES_Global.TaskTable[Id].AppId = Id; - CFE_ES_Global.AppTable[Id].AppState = CFE_ES_AppState_RUNNING; - UT_Report(__FILE__, __LINE__, - CFE_ES_ShellOutputCommand("ES_ListApps", "") == CFE_SUCCESS, - "CFE_ES_ShellOutputCommand", - "Send ES list applications command"); - CFE_ES_Global.TaskTable[Id].RecordUsed = false; - - /* Test shell output command using an ES list tasks command */ - ES_ResetUnitTest(); - OS_TaskCreate(&TestObjId, "UT", NULL, NULL, 0, 0, 0); - Id = ES_UT_OSALID_TO_ARRAYIDX(TestObjId); - CFE_ES_Global.TaskTable[Id].TaskId = TestObjId; - CFE_ES_Global.TaskTable[Id].RecordUsed = true; - CFE_ES_Global.TaskTable[Id].AppId = Id; - CFE_ES_Global.AppTable[Id].AppState = CFE_ES_AppState_RUNNING; - UT_Report(__FILE__, __LINE__, - CFE_ES_ShellOutputCommand("ES_ListTasks", "") == CFE_SUCCESS, - "CFE_ES_ShellOutputCommand", - "Send ES list tasks command"); - CFE_ES_Global.TaskTable[Id].RecordUsed = false; - - /* Test shell output command using an ES list resources command. Alter - * the OS_lseek() response to increase branch path coverage - */ - ES_ResetUnitTest(); - UT_SetDeferredRetcode(UT_KEY(OS_lseek), 1, CFE_PLATFORM_ES_MAX_SHELL_PKT + 1); - UT_Report(__FILE__, __LINE__, - CFE_ES_ShellOutputCommand("ES_ListResources", "") == CFE_SUCCESS, - "CFE_ES_ShellOutputCommand", - "Send ES list resources command"); - - /* Test shell output command using a valid OS command but with a failed - * OS lseek - */ - ES_ResetUnitTest(); - UT_SetDeferredRetcode(UT_KEY(OS_lseek), 1, CFE_PLATFORM_ES_MAX_SHELL_PKT - 2); - UT_SetForceFail(UT_KEY(OS_lseek), OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ShellOutputCommand("ls", "") == CFE_ES_ERR_SHELL_CMD, - "CFE_ES_ShellOutputCommand", - "OS command; OS lseek failure"); - - /* Test shell output command using a valid OS command to start sending - * packets down - */ - ES_ResetUnitTest(); - UT_SetDeferredRetcode(UT_KEY(OS_lseek), 2, CFE_PLATFORM_ES_MAX_SHELL_PKT * 2 + 1); - UT_Report(__FILE__, __LINE__, - CFE_ES_ShellOutputCommand("ls", "") == CFE_SUCCESS, - "CFE_ES_ShellOutputCommand", - "Multiple packets to send down"); - - /* Test shell output command using a valid ES command but with a failed - * OS create - */ - ES_ResetUnitTest(); - UT_SetForceFail(UT_KEY(OS_creat), OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ShellOutputCommand("ES_ListApps", - "") == CFE_ES_ERR_SHELL_CMD, - "CFE_ES_ShellOutputCommand", - "ES command; OS create failure"); - - /* Test shell output command using a valid ES command but with a failed - * OS lseek - */ - ES_ResetUnitTest(); - UT_SetForceFail(UT_KEY(OS_lseek), OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ShellOutputCommand("ES_ListApps", - "") == CFE_ES_ERR_SHELL_CMD, - "CFE_ES_ShellOutputCommand", - "ES command; OS lseek failed"); - - /* Test list application function with a failed OS write */ - ES_ResetUnitTest(); - UT_SetDeferredRetcode(UT_KEY(OS_write), 1, OS_ERROR); - OS_TaskCreate(&TestObjId, "UT", NULL, NULL, 0, 0, 0); - Id = ES_UT_OSALID_TO_ARRAYIDX(TestObjId); - OS_TaskCreate(&TestObjId2, "UT", NULL, NULL, 0, 0, 0); - Id2 = ES_UT_OSALID_TO_ARRAYIDX(TestObjId2); - CFE_ES_Global.AppTable[Id].AppState = CFE_ES_AppState_RUNNING; - CFE_ES_Global.AppTable[Id2].AppState = CFE_ES_AppState_RUNNING; - UT_Report(__FILE__, __LINE__, - CFE_ES_ListApplications(Id) == OS_ERROR, - "CFE_ES_ListApplications", - "File write error"); - CFE_ES_Global.AppTable[Id].AppState = CFE_ES_AppState_UNDEFINED; - CFE_ES_Global.AppTable[Id2].AppState = CFE_ES_AppState_UNDEFINED; - - /* Test list application function with a failed OS seek */ - ES_ResetUnitTest(); - UT_SetDeferredRetcode(UT_KEY(OS_lseek), 1, OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ListTasks(0) == OS_ERROR, - "CFE_ES_ListTasks", - "File seek error"); - - /* Test list application function with a failed OS write */ - ES_ResetUnitTest(); - UT_SetDeferredRetcode(UT_KEY(OS_write), 1, OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ListTasks(0) == OS_ERROR, - "CFE_ES_ListTasks", - "File write error"); - - /* Test list application function with a failed OS write on a - * subsequent pass - */ - ES_ResetUnitTest(); - OS_TaskCreate(&TestObjId, "UT", NULL, NULL, 0, 0, 0); - Id = ES_UT_OSALID_TO_ARRAYIDX(TestObjId); - OS_TaskCreate(&TestObjId2, "UT", NULL, NULL, 0, 0, 0); - Id2 = ES_UT_OSALID_TO_ARRAYIDX(TestObjId2); - CFE_ES_Global.TaskTable[Id].RecordUsed = true; - CFE_ES_Global.AppTable[Id].AppState = CFE_ES_AppState_RUNNING; - CFE_ES_Global.TaskTable[Id].AppId = Id2; - CFE_ES_Global.TaskTable[Id2].RecordUsed = true; - CFE_ES_Global.AppTable[Id2].AppState = CFE_ES_AppState_RUNNING; - CFE_ES_Global.TaskTable[Id2].AppId = Id2; - UT_SetDeferredRetcode(UT_KEY(OS_write), 2, OS_ERROR); - UT_Report(__FILE__, __LINE__, - CFE_ES_ListTasks(0) == OS_ERROR, - "CFE_ES_ListTasks", - "File write error (second pass)"); - - /* Test list application function with a failure to get the task - * information - */ - ES_ResetUnitTest(); - UT_SetDeferredRetcode(UT_KEY(OS_write), 3, OS_ERROR); - OS_TaskCreate(&TestObjId, "UT", NULL, NULL, 0, 0, 0); - Id = ES_UT_OSALID_TO_ARRAYIDX(TestObjId); - OS_TaskCreate(&TestObjId2, "UT", NULL, NULL, 0, 0, 0); - Id2 = ES_UT_OSALID_TO_ARRAYIDX(TestObjId2); - CFE_ES_Global.TaskTable[Id2].RecordUsed = true; - CFE_ES_Global.TaskTable[Id2].AppId = Id; - UT_Report(__FILE__, __LINE__, - CFE_ES_ListTasks(0) == CFE_ES_ERR_TASKID, - "CFE_ES_ListTasks", - "Get task info error"); -} - void TestTask(void) { uint32 Id; @@ -2465,7 +2224,6 @@ void TestTask(void) CFE_SB_Msg_t Msg; CFE_ES_NoArgsCmd_t NoArgsCmd; CFE_ES_Restart_t RestartCmd; - CFE_ES_Shell_t ShellCmd; CFE_ES_StartApp_t StartAppCmd; CFE_ES_StopApp_t StopAppCmd; CFE_ES_RestartApp_t RestartAppCmd; @@ -2668,29 +2426,6 @@ void TestTask(void) "CFE_ES_RestartCmd", "Invalid restart type"); - /* Test shell command failure */ - ES_ResetUnitTest(); - memset(&CmdBuf, 0, sizeof(CmdBuf)); - strncpy((char *) CmdBuf.ShellCmd.Payload.CmdString, "ES_NOAPP", - sizeof(CmdBuf.ShellCmd.Payload.CmdString)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_Shell_t), - UT_TPID_CFE_ES_CMD_SHELL_CC); - UT_Report(__FILE__, __LINE__, - UT_EventIsInHistory(CFE_ES_SHELL_ERR_EID), - "CFE_ES_ShellCmd", - "Shell command fail"); - - /* Test successful shell command */ - ES_ResetUnitTest(); - strncpy((char *) CmdBuf.ShellCmd.Payload.CmdString, "ls", - sizeof(CmdBuf.ShellCmd.Payload.CmdString)); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, sizeof(CFE_ES_Shell_t), - UT_TPID_CFE_ES_CMD_SHELL_CC); - UT_Report(__FILE__, __LINE__, - UT_EventIsInHistory(CFE_ES_SHELL_INF_EID), - "CFE_ES_ShellCmd", - "Shell command success"); - /* Test successful app create */ ES_ResetUnitTest(); memset(&CmdBuf, 0, sizeof(CmdBuf)); @@ -3567,15 +3302,6 @@ void TestTask(void) "CFE_ES_RestartCmd", "Power on reset restart type"); - /* Test sending a shell command with an invalid command length */ - ES_ResetUnitTest(); - UT_CallTaskPipe(CFE_ES_TaskPipe, &CmdBuf.Msg, 0, - UT_TPID_CFE_ES_CMD_SHELL_CC); - UT_Report(__FILE__, __LINE__, - UT_EventIsInHistory(CFE_ES_LEN_ERR_EID), - "CFE_ES_ShellCmd", - "Shell command; invalid command length"); - /* Test sending a start application command with an invalid command * length */ diff --git a/fsw/cfe-core/unit-test/es_UT.h b/fsw/cfe-core/unit-test/es_UT.h index b597c7a1d..16a248490 100644 --- a/fsw/cfe-core/unit-test/es_UT.h +++ b/fsw/cfe-core/unit-test/es_UT.h @@ -164,27 +164,6 @@ void TestApps(void); ******************************************************************************/ void TestERLog(void); -/*****************************************************************************/ -/** -** \brief Performs tests on the ES shell commanding system contained in -** cfe_es_shell.c -** -** \par Description -** This function tests the shell output command paths in the function -** CFE_ES_ShellOutputCommand. -** -** \par Assumptions, External Events, and Notes: -** None -** -** \returns -** This function does not return a value. -** -** \sa #UT_Text, #UT_SetOSFail, #UT_Report, #CFE_ES_ShellOutputCommand -** \sa #UT_SetRtnCode -** -******************************************************************************/ -void TestShell(void); - /*****************************************************************************/ /** ** \brief Performs tests of the ground command functions contained in @@ -204,7 +183,7 @@ void TestShell(void); ** \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_ShellCmd, #CFE_ES_StartAppCmd +** \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