diff --git a/docs/users_guide/html/doxygen.css b/docs/users_guide/html/doxygen.css index 1c4cbf9..c006594 100644 --- a/docs/users_guide/html/doxygen.css +++ b/docs/users_guide/html/doxygen.css @@ -368,7 +368,6 @@ hr { -moz-border-radius-topleft: 8px; -moz-border-radius-topright: 8px; -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px; - } .memdoc { diff --git a/fsw/mission_inc/sch_perfids.h b/fsw/mission_inc/sch_perfids.h index c8e46a0..ce083dc 100644 --- a/fsw/mission_inc/sch_perfids.h +++ b/fsw/mission_inc/sch_perfids.h @@ -22,7 +22,3 @@ #define SCH_APPMAIN_PERF_ID 36 #endif /* _sch_perfids_h_ */ - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/platform_inc/sch_msgids.h b/fsw/platform_inc/sch_msgids.h index f6b1007..38590cb 100644 --- a/fsw/platform_inc/sch_msgids.h +++ b/fsw/platform_inc/sch_msgids.h @@ -42,7 +42,3 @@ */ #endif /* _sch_msgids_h_ */ - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/platform_inc/sch_platform_cfg.h b/fsw/platform_inc/sch_platform_cfg.h index 9ac2fc6..98c1a91 100644 --- a/fsw/platform_inc/sch_platform_cfg.h +++ b/fsw/platform_inc/sch_platform_cfg.h @@ -296,7 +296,3 @@ #endif /* _sch_platform_cfg_h_ */ - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/public_inc/sch_api.h b/fsw/public_inc/sch_api.h index 4e07f80..a3b2ff6 100644 --- a/fsw/public_inc/sch_api.h +++ b/fsw/public_inc/sch_api.h @@ -85,8 +85,3 @@ void SCH_DisableProcessing(void); boolean SCH_GetProcessingState(void); #endif /* _sch_api_ */ - -/************************/ -/* End of File Comment */ -/************************/ - diff --git a/fsw/src/sch_api.c b/fsw/src/sch_api.c index 7235761..cda9f23 100644 --- a/fsw/src/sch_api.c +++ b/fsw/src/sch_api.c @@ -35,7 +35,7 @@ SCH_LibData_t SCH_LibData; /******************************************************************* ** -** SCH_LibInit() -- Initializes the SCH Library +** Initializes the SCH Library ** ** NOTE: For complete prolog information, see 'sch_apipriv.h'. ********************************************************************/ @@ -47,7 +47,7 @@ int32 SCH_LibInit(void) /******************************************************************* ** -** SCH_EnableProcessing() -- Enables SCH schedule processing +** Enables SCH schedule processing ** ** NOTE: For complete prolog information, see 'sch_api.h'. ********************************************************************/ @@ -62,7 +62,7 @@ void SCH_EnableProcessing(void) /******************************************************************* ** -** SCH_DisableProcessing() -- Disables SCH schedule processing +** Disables SCH schedule processing ** ** NOTE: For complete prolog information, see 'sch_api.h'. ********************************************************************/ @@ -74,8 +74,7 @@ void SCH_DisableProcessing(void) /******************************************************************* ** -** SCH_GetProcessingState() -- Obtains the current SCH schedule -** table processing state +** Obtains the current SCH schedule table processing state ** ** NOTE: For complete prolog information, see 'sch_api.h'. ********************************************************************/ diff --git a/fsw/src/sch_apipriv.h b/fsw/src/sch_apipriv.h index efc367f..bb03d1b 100644 --- a/fsw/src/sch_apipriv.h +++ b/fsw/src/sch_apipriv.h @@ -105,7 +105,3 @@ void SCH_DisableProcessing(void); boolean SCH_GetProcessingState(void); #endif /* _sch_apipriv_ */ - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/src/sch_app.c b/fsw/src/sch_app.c index 3b3b6e4..93d6951 100644 --- a/fsw/src/sch_app.c +++ b/fsw/src/sch_app.c @@ -113,9 +113,6 @@ SCH_AppData_t SCH_AppData; **************************************************************************/ /******************************************************************* -** -** SCH_AppMain -** ** NOTE: For complete prolog information, see 'sch_app.h' ********************************************************************/ @@ -231,7 +228,6 @@ void SCH_AppMain(void) */ RunStatus = CFE_ES_APP_ERROR; } - } /* End of while */ /* @@ -265,14 +261,10 @@ void SCH_AppMain(void) ** Let cFE kill the task (and any child tasks) */ CFE_ES_ExitApp(RunStatus); - -} /* End of SH_AppMain() */ +} /******************************************************************* -** -** SCH_AppInit -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -351,14 +343,10 @@ int32 SCH_AppInit(void) SCH_MISSION_REV); return(Status); - -} /* End of SCH_AppInit() */ +} /******************************************************************* -** -** SCH_EvsInit -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -391,14 +379,10 @@ int32 SCH_EvsInit(void) } return(Status); - -} /* End of SCH_EvsInit() */ +} /******************************************************************* -** -** SCH_SbInit -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -455,14 +439,10 @@ int32 SCH_SbInit(void) } return(Status); - -} /* End of SCH_SbInit() */ +} /******************************************************************* -** -** SCH_TblInit -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -568,14 +548,10 @@ int32 SCH_TblInit(void) } return(Status); - -} /* End of SCH_TblInit() */ +} /******************************************************************* -** -** SCH_TimerInit -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -648,14 +624,10 @@ int32 SCH_TimerInit(void) } return(Status); - -} /* End of SCH_TimerInit() */ +} /******************************************************************* -** -** SCH_ProcessScheduleTable -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -809,14 +781,10 @@ int32 SCH_ProcessScheduleTable(void) } return(Result); - -} /* End of SCH_ProcessScheduleTable() */ +} /******************************************************************* -** -** SCH_ProcessNextSlot -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -871,14 +839,10 @@ int32 SCH_ProcessNextSlot(void) SCH_AppData.SlotsProcessedCount++; return(Result); - -} /* End of SCH_ProcessNextSlot() */ +} /******************************************************************* -** -** SCH_ProcessNextEntry -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -965,14 +929,10 @@ void SCH_ProcessNextEntry(SCH_ScheduleEntry_t *NextEntry, int32 EntryNumber) } return; - -} /* End of SCH_ProcessNextEntry() */ +} /******************************************************************* -** -** SCH_ProcessCommands -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -1002,14 +962,10 @@ int32 SCH_ProcessCommands(void) } return(Status); - -} /* End of SCH_ProcessCommands() */ +} /******************************************************************* -** -** SCH_ValidateScheduleData -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -1143,14 +1099,10 @@ int32 SCH_ValidateScheduleData(void *TableData) } return(TableResult); - -} /* End of SCH_ValidateScheduleData() */ +} /******************************************************************* -** -** SCH_ValidateMessageData -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -1262,11 +1214,4 @@ int32 SCH_ValidateMessageData(void *TableData) } return(TableResult); - -} /* End of SCH_ValidateMessageData() */ - - -/************************/ -/* End of File Comment */ -/************************/ - +} diff --git a/fsw/src/sch_app.h b/fsw/src/sch_app.h index ed509e6..9ae5cdb 100644 --- a/fsw/src/sch_app.h +++ b/fsw/src/sch_app.h @@ -230,7 +230,6 @@ typedef struct boolean IgnoreMajorFrame; /**< \brief Major Frame too noisy to trust */ boolean IgnoreMajorFrameMsgSent; /**< \brief Major Frame Event Message has been sent */ boolean UnexpectedMajorFrame; /**< \brief Major Frame signal was unexpected */ - } SCH_AppData_t; /************************************************************************* @@ -486,7 +485,3 @@ int32 SCH_ValidateScheduleData(void *TableData); int32 SCH_ValidateMessageData(void *TableData); #endif /* _sch_app_ */ - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/src/sch_cmds.c b/fsw/src/sch_cmds.c index bcc641b..e4335b2 100644 --- a/fsw/src/sch_cmds.c +++ b/fsw/src/sch_cmds.c @@ -57,9 +57,6 @@ extern SCH_AppData_t SCH_AppData; */ /******************************************************************* -** -** SCH_AppPipe -** ** NOTE: For complete prolog information, see 'sch_cmds.h' ********************************************************************/ @@ -143,14 +140,10 @@ int32 SCH_AppPipe(CFE_SB_MsgPtr_t MessagePtr) } return(Result); - -} /* End of SCH_AppPipe() */ +} /******************************************************************* -** -** SCH_HousekeepingCmd -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -215,14 +208,10 @@ int32 SCH_HousekeepingCmd(CFE_SB_MsgPtr_t MessagePtr) TableResult = SCH_AcquirePointers(); return(TableResult); - -} /* End of SCH_HousekeepingCmd() */ +} /******************************************************************* -** -** SCH_NoopCmd -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -248,14 +237,10 @@ void SCH_NoopCmd(CFE_SB_MsgPtr_t MessagePtr) } return; - -} /* End of SCH_NoopCmd() */ +} /******************************************************************* -** -** SCH_ResetCmd -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -294,14 +279,10 @@ void SCH_ResetCmd(CFE_SB_MsgPtr_t MessagePtr) } return; - -} /* End of SCH_ResetCmd() */ +} /******************************************************************* -** -** SCH_EnableCmd -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -364,14 +345,10 @@ void SCH_EnableCmd(CFE_SB_MsgPtr_t MessagePtr) SCH_PostCommandResult(GoodCommand); return; - -} /* End of SCH_EnableCmd() */ +} /******************************************************************* -** -** SCH_DisableCmd -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -434,14 +411,10 @@ void SCH_DisableCmd(CFE_SB_MsgPtr_t MessagePtr) SCH_PostCommandResult(GoodCommand); return; - -} /* End of SCH_DisableCmd() */ +} /******************************************************************* -** -** SCH_EnableGroupCmd -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -525,14 +498,10 @@ void SCH_EnableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) SCH_PostCommandResult(GoodCommand); return; - -} /* End of SCH_EnableGroupCmd() */ +} /******************************************************************* -** -** SCH_DisableGroupCmd -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -616,14 +585,10 @@ void SCH_DisableGroupCmd(CFE_SB_MsgPtr_t MessagePtr) SCH_PostCommandResult(GoodCommand); return; - -} /* End of SCH_DisableGroupCmd() */ +} /******************************************************************* -** -** SCH_EnableSyncCmd -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -646,16 +611,12 @@ void SCH_EnableSyncCmd(CFE_SB_MsgPtr_t MessagePtr) SCH_PostCommandResult(GoodCommand); return; - -} /* End of SCH_EnableSyncCmd() */ +} /******************************************************************* -** -** SCH_SendDiagTlmCmd -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -710,14 +671,10 @@ void SCH_SendDiagTlmCmd(CFE_SB_MsgPtr_t MessagePtr) SCH_PostCommandResult(GoodCommand); return; - -} /* End of SCH_SendDiagTlmCmd() */ +} /******************************************************************* -** -** SCH_AcquirePointers -** ** NOTE: For complete prolog information, see 'sch_cmds.h' ********************************************************************/ @@ -759,14 +716,10 @@ int32 SCH_AcquirePointers(void) } return(Result); - -} /* End of SCH_AcquirePointers() */ +} /******************************************************************* -** -** SCH_VerifyCmdLength -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -792,14 +745,10 @@ int32 SCH_VerifyCmdLength (CFE_SB_MsgPtr_t MessagePtr, uint32 ExpectedLength) } return Status; - -} /* End of SCH_VerifyCmdLength () */ +} /******************************************************************* -** -** SCH_PostCommandResult -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -815,12 +764,4 @@ void SCH_PostCommandResult(boolean GoodCommand) } return; - -} /* End of SCH_PostCommandResult() */ - - - -/************************/ -/* End of File Comment */ -/************************/ - +} diff --git a/fsw/src/sch_cmds.h b/fsw/src/sch_cmds.h index e0efdc2..8536f72 100644 --- a/fsw/src/sch_cmds.h +++ b/fsw/src/sch_cmds.h @@ -314,7 +314,3 @@ void SCH_PostCommandResult(boolean GoodCommand); int32 SCH_VerifyCmdLength (CFE_SB_MsgPtr_t MessagePtr, uint32 ExpectedLength); #endif /* _sch_cmds_ */ - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/src/sch_custom.c b/fsw/src/sch_custom.c index ab8d72c..55fc4d7 100644 --- a/fsw/src/sch_custom.c +++ b/fsw/src/sch_custom.c @@ -54,9 +54,6 @@ /******************************************************************* -** -** SCH_CustomEarlyInit -** ** NOTE: For complete prolog information, see 'sch_custom.h' ** ** This function MUST update SCH_AppData.ClockAccuracy to the @@ -73,14 +70,10 @@ int32 SCH_CustomEarlyInit(void) SCH_MinorFrameCallback); return Status; - -} /* End of CustomEarlyInit() */ +} /******************************************************************* -** -** SCH_CustomLateInit -** ** NOTE: For complete prolog information, see 'sch_custom.h' ** ** This function MUST perform any startup synchronization required, @@ -109,14 +102,10 @@ int32 SCH_CustomLateInit(void) } return Status; - -} /* End of SH_CustomLateInit() */ +} /******************************************************************* -** -** SCH_CustomGetCurrentSlotNumber -** ** NOTE: For complete prolog information, see 'sch_custom.h' ********************************************************************/ @@ -150,12 +139,9 @@ uint32 SCH_CustomGetCurrentSlotNumber(void) } return CurrentSlot; -} /* End of SH_CustomGetCurrentSlotNumber() */ +} /******************************************************************* -** -** SCH_CustomCleanup -** ** NOTE: For complete prolog information, see 'sch_custom.h' ********************************************************************/ @@ -163,14 +149,10 @@ void SCH_CustomCleanup(void) { /* unregister the TIME callback for the major frame */ CFE_TIME_UnregisterSynchCallback((CFE_TIME_SynchCallbackPtr_t)&SCH_MajorFrameCallback); - -} /* End of SH_CustomCleanup() */ +} /******************************************************************* -** -** SCH_GetMETSlotNumber -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -216,14 +198,10 @@ uint32 SCH_GetMETSlotNumber(void) } return METSlot; - } /******************************************************************* -** -** SCH_MajorFrameCallback -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -335,14 +313,10 @@ void SCH_MajorFrameCallback(void) SCH_AppData.LastSyncMETSlot = SCH_GetMETSlotNumber(); return; - -} /* End of SCH_MajorFrameCallback() */ +} /******************************************************************* -** -** SCH_MinorFrameCallback -** ** NOTE: For complete prolog information, see above ********************************************************************/ @@ -441,11 +415,4 @@ void SCH_MinorFrameCallback(uint32 TimerId) OS_BinSemGive(SCH_AppData.TimeSemaphore); return; - -} /* End of SCH_MinorFrameCallback() */ - - -/************************/ -/* End of File Comment */ -/************************/ - +} diff --git a/fsw/src/sch_custom.h b/fsw/src/sch_custom.h index f281466..aa7441a 100644 --- a/fsw/src/sch_custom.h +++ b/fsw/src/sch_custom.h @@ -169,6 +169,3 @@ void SCH_MajorFrameCallback(void); void SCH_MinorFrameCallback(uint32 TimerId); #endif /* _sch_custom_ */ -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/src/sch_events.h b/fsw/src/sch_events.h index 5cc285f..cb2391c 100644 --- a/fsw/src/sch_events.h +++ b/fsw/src/sch_events.h @@ -707,7 +707,3 @@ #define SCH_CMD_LEN_ERR_EID 60 #endif /* _sch_events_ */ - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/src/sch_msg.h b/fsw/src/sch_msg.h index 8f5fb25..f4c83e8 100644 --- a/fsw/src/sch_msg.h +++ b/fsw/src/sch_msg.h @@ -55,7 +55,6 @@ typedef struct { uint8 CmdHeader[CFE_SB_CMD_HDR_SIZE]; /**< \brief cFE Software Bus Command Message Header */ - } SCH_NoArgsCmd_t; /* @@ -74,7 +73,6 @@ typedef struct /**< \details Valid Range is zero to (#SCH_TOTAL_SLOTS - 1) */ uint16 EntryNumber; /**< \brief Entry Number of Activity whose state is to change \details Valid Range is zero to (#SCH_ENTRIES_PER_SLOT - 1) */ - } SCH_EntryCmd_t; /* @@ -244,8 +242,3 @@ typedef struct } SCH_DiagPacket_t; #endif /* _sch_msg_ */ - -/************************/ -/* End of File Comment */ -/************************/ - diff --git a/fsw/src/sch_msgdefs.h b/fsw/src/sch_msgdefs.h index 19dfcc3..3b3abf6 100644 --- a/fsw/src/sch_msgdefs.h +++ b/fsw/src/sch_msgdefs.h @@ -407,8 +407,3 @@ #endif /* _sch_msgdefs_ */ - -/************************/ -/* End of File Comment */ -/************************/ - diff --git a/fsw/src/sch_tbldefs.h b/fsw/src/sch_tbldefs.h index 9c16393..6e0efb2 100644 --- a/fsw/src/sch_tbldefs.h +++ b/fsw/src/sch_tbldefs.h @@ -45,7 +45,6 @@ typedef struct uint16 MessageIndex; /**< \brief Byte index into Message Definition Table */ uint32 GroupData; /**< \brief Group and Multi-Group membership definitions */ - } SCH_ScheduleEntry_t; /* @@ -54,7 +53,6 @@ typedef struct typedef struct { uint16 MessageBuffer[SCH_MAX_MSG_WORDS]; /**< \brief Packed Messages */ - } SCH_MessageEntry_t; diff --git a/fsw/src/sch_verify.h b/fsw/src/sch_verify.h index 1b66a51..bf21ef6 100644 --- a/fsw/src/sch_verify.h +++ b/fsw/src/sch_verify.h @@ -125,7 +125,3 @@ /*************************************************************************/ #endif /* _sch_verify_ */ - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/tables/sch_def_msgtbl.c b/fsw/tables/sch_def_msgtbl.c index bb8d511..99546a9 100644 --- a/fsw/tables/sch_def_msgtbl.c +++ b/fsw/tables/sch_def_msgtbl.c @@ -390,7 +390,6 @@ SCH_MessageEntry_t SCH_DefaultMessageTable[SCH_MAX_MESSAGES] = { { CFE_MAKE_BIG16(SCH_UNUSED_MID) } }, /* command ID #127 */ { { CFE_MAKE_BIG16(SCH_UNUSED_MID) } } - }; /* @@ -417,8 +416,3 @@ CFE_TBL_FILEDEF(SCH_DefaultMessageTable, SCH.MSG_DEFS, SCH message definitions t /* ** (none) */ - -/************************/ -/* End of File Comment */ -/************************/ - diff --git a/fsw/tables/sch_def_schtbl.c b/fsw/tables/sch_def_schtbl.c index eede891..cfafef4 100644 --- a/fsw/tables/sch_def_schtbl.c +++ b/fsw/tables/sch_def_schtbl.c @@ -77,7 +77,6 @@ */ SCH_ScheduleEntry_t SCH_DefaultScheduleTable[SCH_TABLE_ENTRIES] = { - /* ** Structure definition... ** @@ -853,8 +852,3 @@ CFE_TBL_FILEDEF(SCH_DefaultScheduleTable, SCH.SCHED_DEF, SCH schedule table, sch /* ** (none) */ - -/************************/ -/* End of File Comment */ -/************************/ - diff --git a/fsw/unit_test/sch_api_test.c b/fsw/unit_test/sch_api_test.c index a01c012..0b18a24 100644 --- a/fsw/unit_test/sch_api_test.c +++ b/fsw/unit_test/sch_api_test.c @@ -27,11 +27,11 @@ #include "ut_osapi_stubs.h" #include "ut_cfe_es_stubs.h" #include "ut_cfe_es_hooks.h" -// FIXME: these need to be implemented/updated in UT-Assert (by copying from sch_test_utils.c/.h): -//#include "ut_cfe_evs_stubs.h" -//#include "ut_cfe_time_stubs.h" -//#include "ut_ostimer_stubs.h" -//#include "ut_cfe_sb_stubs.h" +/* FIXME: these need to be implemented/updated in UT-Assert (by copying from sch_test_utils.c/.h): */ +/* #include "ut_cfe_evs_stubs.h" */ +/* #include "ut_cfe_time_stubs.h" */ +/* #include "ut_ostimer_stubs.h" */ +/* #include "ut_cfe_sb_stubs.h" */ #include "ut_cfe_psp_memutils_stubs.h" #include "ut_cfe_psp_watchdog_stubs.h" #include "ut_cfe_psp_timer_stubs.h" @@ -57,8 +57,7 @@ void SCH_LibInit_Test(void) UtAssert_True (Result == OS_SUCCESS, "Result == OS_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_LibInit_Test */ +} void SCH_EnableProcessing_Test(void) { @@ -71,8 +70,7 @@ void SCH_EnableProcessing_Test(void) UtAssert_True (SCH_LibData.ProcessingDisabledCtr == 0, "SCH_LibData.ProcessingDisabledCtr == 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_EnableProcessing_Test */ +} void SCH_DisableProcessing_Test(void) { @@ -83,8 +81,7 @@ void SCH_DisableProcessing_Test(void) UtAssert_True (SCH_LibData.ProcessingDisabledCtr == 1, "SCH_LibData.ProcessingDisabledCtr == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_DisableProcessing_Test */ +} void SCH_GetProcessingState_Test_True(void) { @@ -99,8 +96,7 @@ void SCH_GetProcessingState_Test_True(void) UtAssert_True (Result == TRUE, "Result == TRUE"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_GetProcessingState_Test_True */ +} void SCH_GetProcessingState_Test_False(void) { @@ -115,8 +111,7 @@ void SCH_GetProcessingState_Test_False(void) UtAssert_True (Result == FALSE, "Result == FALSE"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_GetProcessingState_Test_False */ +} void SCH_API_Test_AddTestCases(void) { @@ -128,9 +123,4 @@ void SCH_API_Test_AddTestCases(void) UtTest_Add(SCH_GetProcessingState_Test_True, SCH_Test_Setup, SCH_Test_TearDown, "SCH_GetProcessingState_Test_True"); UtTest_Add(SCH_GetProcessingState_Test_False, SCH_Test_Setup, SCH_Test_TearDown, "SCH_GetProcessingState_Test_False"); - -} /* end SCH_API_Test_AddTestCases */ - -/************************/ -/* End of File Comment */ -/************************/ +} diff --git a/fsw/unit_test/sch_api_test.h b/fsw/unit_test/sch_api_test.h index 79aafc4..c7dff2e 100644 --- a/fsw/unit_test/sch_api_test.h +++ b/fsw/unit_test/sch_api_test.h @@ -24,8 +24,3 @@ */ void SCH_API_Test_AddTestCases(void); - - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/unit_test/sch_app_test.c b/fsw/unit_test/sch_app_test.c index 1e4c229..ff59388 100644 --- a/fsw/unit_test/sch_app_test.c +++ b/fsw/unit_test/sch_app_test.c @@ -28,11 +28,11 @@ #include "ut_osapi_stubs.h" #include "ut_cfe_es_stubs.h" #include "ut_cfe_es_hooks.h" -// FIXME: these need to be implemented/updated in UT-Assert (by copying from sch_test_utils.c/.h): -//#include "ut_cfe_evs_stubs.h" -//#include "ut_cfe_time_stubs.h" -//#include "ut_ostimer_stubs.h" -//#include "ut_cfe_sb_stubs.h" +/* FIXME: these need to be implemented/updated in UT-Assert (by copying from sch_test_utils.c/.h): */ +/* #include "ut_cfe_evs_stubs.h" */ +/* #include "ut_cfe_time_stubs.h" */ +/* #include "ut_ostimer_stubs.h" */ +/* #include "ut_cfe_sb_stubs.h" */ #include "ut_cfe_psp_memutils_stubs.h" #include "ut_cfe_psp_watchdog_stubs.h" #include "ut_cfe_psp_timer_stubs.h" @@ -105,8 +105,7 @@ void SCH_AppMain_Test_RegisterAppError(void) UtAssert_True (SCH_AppData.AppID == 99, "SCH_AppData.AppID == 99"); UtAssert_True (Ut_CFE_ES_GetSysLogQueueDepth() == 1, "Ut_CFE_ES_GetSysLogQueueDepth() == 1"); - -} /* end SCH_AppMain_Test_RegisterAppError */ +} void SCH_AppMain_Test_AppInitError(void) { @@ -134,8 +133,7 @@ void SCH_AppMain_Test_AppInitError(void) UtAssert_True (Ut_CFE_ES_GetSysLogQueueDepth() == 2, "Ut_CFE_ES_GetSysLogQueueDepth() == 2"); /* Generates 1 system log message we don't care about in this test */ - -} /* end SCH_AppMain_Test_AppInitError */ +} void SCH_AppMain_Test_CustomLateInitError(void) { @@ -172,8 +170,7 @@ void SCH_AppMain_Test_CustomLateInitError(void) UtAssert_True (Ut_CFE_ES_GetSysLogQueueDepth() == 1, "Ut_CFE_ES_GetSysLogQueueDepth() == 1"); /* Generates 1 system log message we don't care about in this test */ - -} /* end SCH_AppMain_Test_CustomLateInitError */ +} void SCH_AppMain_Test_NoisyMajorFrameError(void) { @@ -212,8 +209,7 @@ void SCH_AppMain_Test_NoisyMajorFrameError(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 3, "Ut_CFE_EVS_GetEventQueueDepth() == 3"); /* Generates 2 event messages we don't care about in this test */ #endif - -} /* end SCH_AppMain_Test_NoisyMajorFrameError */ +} void SCH_AppMain_Test_NominalIgnoreMajorFrameFalse(void) { @@ -239,8 +235,7 @@ void SCH_AppMain_Test_NominalIgnoreMajorFrameFalse(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppMain_Test_NominalIgnoreMajorFrameFalse */ +} void SCH_AppMain_Test_ProcessScheduleTableError(void) { @@ -287,8 +282,7 @@ void SCH_AppMain_Test_ProcessScheduleTableError(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 3, "Ut_CFE_EVS_GetEventQueueDepth() == 3"); /* Generates 3 event messages we don't care about in this test */ - -} /* end SCH_AppMain_Test_ProcessScheduleTableError */ +} void SCH_AppMain_Test_Nominal(void) { @@ -312,8 +306,7 @@ void SCH_AppMain_Test_Nominal(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppMain_Test_Nominal */ +} void SCH_AppInit_Test_GetAppIDError(void) { @@ -353,8 +346,7 @@ void SCH_AppInit_Test_GetAppIDError(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); UtAssert_True (Ut_CFE_ES_GetSysLogQueueDepth() == 1, "Ut_CFE_ES_GetSysLogQueueDepth() == 1"); - -} /* end SCH_AppInit_Test_GetAppIDError */ +} void SCH_AppInit_Test_EvsInitError(void) { @@ -388,8 +380,7 @@ void SCH_AppInit_Test_EvsInitError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_AppInit_Test_EvsInitError */ +} void SCH_AppInit_Test_SbInitError(void) { @@ -424,8 +415,7 @@ void SCH_AppInit_Test_SbInitError(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppInit_Test_SbInitError */ +} void SCH_AppInit_Test_TblInitError(void) { @@ -460,8 +450,7 @@ void SCH_AppInit_Test_TblInitError(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppInit_Test_TblInitError */ +} void SCH_AppInit_Test_TimerInitError(void) { @@ -500,8 +489,7 @@ void SCH_AppInit_Test_TimerInitError(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppInit_Test_TimerInitError */ +} void SCH_AppInit_Test_Nominal(void) { @@ -540,8 +528,7 @@ void SCH_AppInit_Test_Nominal(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_AppInit_Test_Nominal */ +} void SCH_EvsInit_Test_RegisterError(void) { @@ -588,8 +575,7 @@ void SCH_EvsInit_Test_RegisterError(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); UtAssert_True (Ut_CFE_ES_GetSysLogQueueDepth() == 1, "Ut_CFE_ES_GetSysLogQueueDepth() == 1"); - -} /* end SCH_EvsInit_Test_RegisterError */ +} void SCH_EvsInit_Test_Nominal(void) { @@ -629,8 +615,7 @@ void SCH_EvsInit_Test_Nominal(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); UtAssert_True (Ut_CFE_ES_GetSysLogQueueDepth() == 0, "Ut_CFE_ES_GetSysLogQueueDepth() == 0"); - -} /* end SCH_EvsInit_Test_Nominal */ +} void SCH_SbInit_Test_CreatePipeError(void) { @@ -656,8 +641,7 @@ void SCH_SbInit_Test_CreatePipeError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_SbInit_Test_CreatePipeError */ +} void SCH_SbInit_Test_SubscribeHKError(void) { @@ -683,8 +667,7 @@ void SCH_SbInit_Test_SubscribeHKError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_SbInit_Test_SubscribeHKError */ +} void SCH_SbInit_Test_SubscribeGNDError(void) { @@ -710,8 +693,7 @@ void SCH_SbInit_Test_SubscribeGNDError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_SbInit_Test_SubscribeGNDError */ +} void SCH_SbInit_Test_Nominal(void) { @@ -730,8 +712,7 @@ void SCH_SbInit_Test_Nominal(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_SbInit_Test_Nominal */ +} void SCH_TblInit_Test_RegisterSdtError(void) { @@ -771,8 +752,7 @@ void SCH_TblInit_Test_RegisterSdtError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_TblInit_Test_RegisterSdtError */ +} void SCH_TblInit_Test_RegisterMdtError(void) { @@ -812,8 +792,7 @@ void SCH_TblInit_Test_RegisterMdtError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_TblInit_Test_RegisterMdtError */ +} void SCH_TblInit_Test_LoadSdtError(void) { @@ -853,8 +832,7 @@ void SCH_TblInit_Test_LoadSdtError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_TblInit_Test_LoadSdtError */ +} void SCH_TblInit_Test_LoadMdtError(void) { @@ -894,8 +872,7 @@ void SCH_TblInit_Test_LoadMdtError(void) UtAssert_True (Result == 0xCC000013, "Result == 0xCC000013"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_TblInit_Test_LoadMdtError */ +} void SCH_TblInit_Test_AcquirePointersError(void) { @@ -939,8 +916,7 @@ void SCH_TblInit_Test_AcquirePointersError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_TblInit_Test_AcquirePointersError */ +} void SCH_TblInit_Test_Nominal(void) { @@ -977,8 +953,7 @@ void SCH_TblInit_Test_Nominal(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_TblInit_Test_Nominal */ +} void SCH_TimerInit_Test_CustomEarlyInitError(void) { @@ -1029,8 +1004,7 @@ void SCH_TimerInit_Test_CustomEarlyInitError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_TimerInit_Test_CustomEarlyInitError */ +} void SCH_TimerInit_Test_TimerAccuracyWarning(void) { @@ -1084,8 +1058,7 @@ void SCH_TimerInit_Test_TimerAccuracyWarning(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_TimerInit_Test_TimerAccuracyWarning */ +} void SCH_TimerInit_Test_BinSemCreateError(void) { @@ -1135,8 +1108,7 @@ void SCH_TimerInit_Test_BinSemCreateError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_TimerInit_Test_BinSemCreateError */ +} void SCH_TimerInit_Test_Nominal(void) { @@ -1179,8 +1151,7 @@ void SCH_TimerInit_Test_Nominal(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_TimerInit_Test_Nominal */ +} void SCH_ProcessScheduleTable_Test_ProcessCount2LastProcessCount1(void) { @@ -1202,8 +1173,7 @@ void SCH_ProcessScheduleTable_Test_ProcessCount2LastProcessCount1(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_ProcessScheduleTable_Test_ProcessCount2LastProcessCount1 */ +} void SCH_ProcessScheduleTable_Test_ProcessCountTotalSlotsLastProcessCountNotSame(void) { @@ -1225,8 +1195,7 @@ void SCH_ProcessScheduleTable_Test_ProcessCountTotalSlotsLastProcessCountNotSame UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_ProcessScheduleTable_Test_ProcessCountTotalSlotsLastProcessCountNotSame */ +} void SCH_ProcessScheduleTable_Test_ProcessCountTotalSlotsLastProcessCountSame(void) { @@ -1254,8 +1223,7 @@ void SCH_ProcessScheduleTable_Test_ProcessCountTotalSlotsLastProcessCountSame(vo UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_ProcessScheduleTable_Test_ProcessCountTotalSlotsLastProcessCountSame */ +} void SCH_ProcessScheduleTable_Test_ProcessCountOtherAndNoRollover(void) { @@ -1277,8 +1245,7 @@ void SCH_ProcessScheduleTable_Test_ProcessCountOtherAndNoRollover(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_ProcessScheduleTable_Test_ProcessCountOtherAndNoRollover */ +} void SCH_ProcessScheduleTable_Test_SkippedSlotsErrorIncrementTablePassCountAndCallProcessCommands(void) { @@ -1313,8 +1280,7 @@ void SCH_ProcessScheduleTable_Test_SkippedSlotsErrorIncrementTablePassCountAndCa UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_ProcessScheduleTable_Test_SkippedSlotsErrorIncrementTablePassCountAndCallProcessCommands */ +} void SCH_ProcessScheduleTable_Test_MultiSlotsProcessCountTooLargeSynchronizedProcessCountGreaterThanMaxSlotsPerWakeup(void) { @@ -1344,8 +1310,7 @@ void SCH_ProcessScheduleTable_Test_MultiSlotsProcessCountTooLargeSynchronizedPro UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_ProcessScheduleTable_Test_MultiSlotsProcessCountTooLargeSynchronizedProcessCountGreaterThanMaxSlotsPerWakeup */ +} void SCH_ProcessScheduleTable_Test_MultiSlotsNotSynchronizedProcessCountGreaterThanMaxSlotsPerWakeup(void) { @@ -1377,8 +1342,7 @@ void SCH_ProcessScheduleTable_Test_MultiSlotsNotSynchronizedProcessCountGreaterT UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_ProcessScheduleTable_Test_MultiSlotsNotSynchronizedProcessCountGreaterThanMaxSlotsPerWakeup */ +} void SCH_ProcessNextSlot_Test_ProcessCommandsRollover(void) { @@ -1404,8 +1368,7 @@ void SCH_ProcessNextSlot_Test_ProcessCommandsRollover(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); /* Generates 2 event message we don't care about in this test */ - -} /* end SCH_ProcessNextSlot_Test_ProcessCommandsRollover */ +} void SCH_ProcessNextSlot_Test_DoNotProcessCommandsNoRollover(void) { @@ -1430,8 +1393,7 @@ void SCH_ProcessNextSlot_Test_DoNotProcessCommandsNoRollover(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); /* Generates 2 event message we don't care about in this test */ - -} /* end SCH_ProcessNextSlot_Test_DoNotProcessCommandsNoRollover */ +} void SCH_ProcessNextEntry_Test_CorruptMessageIndex(void) { @@ -1461,8 +1423,7 @@ void SCH_ProcessNextEntry_Test_CorruptMessageIndex(void) UtAssert_True (SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED, "SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ProcessNextEntry_Test_CorruptMessageIndex */ +} void SCH_ProcessNextEntry_Test_CorruptFrequency(void) { @@ -1492,8 +1453,7 @@ void SCH_ProcessNextEntry_Test_CorruptFrequency(void) UtAssert_True (SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED, "SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ProcessNextEntry_Test_CorruptFrequency */ +} void SCH_ProcessNextEntry_Test_CorruptType(void) { @@ -1523,8 +1483,7 @@ void SCH_ProcessNextEntry_Test_CorruptType(void) UtAssert_True (SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED, "SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ProcessNextEntry_Test_CorruptType */ +} void SCH_ProcessNextEntry_Test_CorruptRemainder(void) { @@ -1554,8 +1513,7 @@ void SCH_ProcessNextEntry_Test_CorruptRemainder(void) UtAssert_True (SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED, "SCH_AppData.ScheduleTable[EntryNumber].EnableState == SCH_DISABLED"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ProcessNextEntry_Test_CorruptRemainder */ +} void SCH_ProcessNextEntry_Test_Success(void) { @@ -1579,8 +1537,7 @@ void SCH_ProcessNextEntry_Test_Success(void) UtAssert_True (SCH_AppData.ScheduleActivitySuccessCount == 1, "SCH_AppData.ScheduleActivitySuccessCount == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_ProcessNextEntry_Test_Success */ +} void SCH_ProcessNextEntry_Test_PacketSendError(void) { @@ -1608,8 +1565,7 @@ void SCH_ProcessNextEntry_Test_PacketSendError(void) "Activity error: slot = 2, entry = 1, err = 0xFFFFFFFF"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_ProcessNextEntry_Test_PacketSendError */ +} void SCH_ProcessCommands_Test_OneMessage(void) { @@ -1635,8 +1591,7 @@ void SCH_ProcessCommands_Test_OneMessage(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_ProcessCommands_Test_OneMessage */ +} void SCH_ProcessCommands_Test_NoMessage(void) { @@ -1657,8 +1612,7 @@ void SCH_ProcessCommands_Test_NoMessage(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_ProcessCommands_Test_NoMessage */ +} void SCH_ProcessCommands_Test_RcvMsgError(void) { @@ -1679,8 +1633,7 @@ void SCH_ProcessCommands_Test_RcvMsgError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_ProcessCommands_Test_RcvMsgError */ +} void SCH_ProcessCommands_Test_AppPipeError(void) { @@ -1704,8 +1657,7 @@ void SCH_ProcessCommands_Test_AppPipeError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_ProcessCommands_Test_AppPipeError */ +} void SCH_ValidateScheduleData_Test_GarbageFrequency(void) { @@ -1739,8 +1691,7 @@ void SCH_ValidateScheduleData_Test_GarbageFrequency(void) UtAssert_True (Result == SCH_SDT_GARBAGE_ENTRY, "Result == SCH_SDT_GARBAGE_ENTRY"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_GarbageFrequency */ +} void SCH_ValidateScheduleData_Test_GarbageRemainder(void) { @@ -1774,8 +1725,7 @@ void SCH_ValidateScheduleData_Test_GarbageRemainder(void) UtAssert_True (Result == SCH_SDT_GARBAGE_ENTRY, "Result == SCH_SDT_GARBAGE_ENTRY"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_GarbageRemainder */ +} void SCH_ValidateScheduleData_Test_GarbageGroupData(void) { @@ -1809,8 +1759,7 @@ void SCH_ValidateScheduleData_Test_GarbageGroupData(void) UtAssert_True (Result == SCH_SDT_GARBAGE_ENTRY, "Result == SCH_SDT_GARBAGE_ENTRY"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_GarbageGroupData */ +} void SCH_ValidateScheduleData_Test_GarbageType(void) { @@ -1844,8 +1793,7 @@ void SCH_ValidateScheduleData_Test_GarbageType(void) UtAssert_True (Result == SCH_SDT_GARBAGE_ENTRY, "Result == SCH_SDT_GARBAGE_ENTRY"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_GarbageType */ +} void SCH_ValidateScheduleData_Test_GarbageMessageIndex(void) { @@ -1879,8 +1827,7 @@ void SCH_ValidateScheduleData_Test_GarbageMessageIndex(void) UtAssert_True (Result == SCH_SDT_GARBAGE_ENTRY, "Result == SCH_SDT_GARBAGE_ENTRY"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_GarbageMessageIndex */ +} void SCH_ValidateScheduleData_Test_EnableStateUnusedAllFieldsUnused(void) { @@ -1910,8 +1857,7 @@ void SCH_ValidateScheduleData_Test_EnableStateUnusedAllFieldsUnused(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_ValidateScheduleData_Test_EnableStateUnusedAllFieldsUnused */ +} void SCH_ValidateScheduleData_Test_EnableStateEnabledFrequencyUnused(void) { @@ -1945,8 +1891,7 @@ void SCH_ValidateScheduleData_Test_EnableStateEnabledFrequencyUnused(void) UtAssert_True (Result == SCH_SDT_NO_FREQUENCY, "Result == SCH_SDT_NO_FREQUENCY"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_EnableStateEnabledFrequencyUnused */ +} void SCH_ValidateScheduleData_Test_EnableStateDisabledFrequencyUnused(void) { @@ -1980,8 +1925,7 @@ void SCH_ValidateScheduleData_Test_EnableStateDisabledFrequencyUnused(void) UtAssert_True (Result == SCH_SDT_NO_FREQUENCY, "Result == SCH_SDT_NO_FREQUENCY"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_EnableStateDisabledFrequencyUnused */ +} void SCH_ValidateScheduleData_Test_BadRemainder(void) { @@ -2015,8 +1959,7 @@ void SCH_ValidateScheduleData_Test_BadRemainder(void) UtAssert_True (Result == SCH_SDT_BAD_REMAINDER, "Result == SCH_SDT_BAD_REMAINDER"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_BadRemainder */ +} void SCH_ValidateScheduleData_Test_BadActivity(void) { @@ -2050,8 +1993,7 @@ void SCH_ValidateScheduleData_Test_BadActivity(void) UtAssert_True (Result == SCH_SDT_BAD_ACTIVITY, "Result == SCH_SDT_BAD_ACTIVITY"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_BadActivity */ +} void SCH_ValidateScheduleData_Test_MsgIndexZero(void) { @@ -2085,8 +2027,7 @@ void SCH_ValidateScheduleData_Test_MsgIndexZero(void) UtAssert_True (Result == SCH_SDT_BAD_MSG_INDEX, "Result == SCH_SDT_BAD_MSG_INDEX"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_MsgIndexZero */ +} void SCH_ValidateScheduleData_Test_MsgIndexTooHigh(void) { @@ -2120,8 +2061,7 @@ void SCH_ValidateScheduleData_Test_MsgIndexTooHigh(void) UtAssert_True (Result == SCH_SDT_BAD_MSG_INDEX, "Result == SCH_SDT_BAD_MSG_INDEX"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_MsgIndexTooHigh */ +} void SCH_ValidateScheduleData_Test_ValidEntryResult(void) { @@ -2152,8 +2092,7 @@ void SCH_ValidateScheduleData_Test_ValidEntryResult(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_ValidateScheduleData_Test_ValidEntryResult */ +} void SCH_ValidateScheduleData_Test_EnableStateOther(void) { @@ -2187,8 +2126,7 @@ void SCH_ValidateScheduleData_Test_EnableStateOther(void) UtAssert_True (Result == SCH_SDT_BAD_ENABLE_STATE, "Result == SCH_SDT_BAD_ENABLE_STATE"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateScheduleData_Test_EnableStateOther */ +} void SCH_ValidateMessageData_Test_MessageIdUnusedGarbageEntry(void) { @@ -2224,8 +2162,7 @@ void SCH_ValidateMessageData_Test_MessageIdUnusedGarbageEntry(void) UtAssert_True (Result == SCH_MDT_GARBAGE_ENTRY, "Result == SCH_MDT_GARBAGE_ENTRY"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateMessageData_Test_MessageIdUnusedGarbageEntry */ +} void SCH_ValidateMessageData_Test_MessageIdUnusedValid(void) { @@ -2252,8 +2189,7 @@ void SCH_ValidateMessageData_Test_MessageIdUnusedValid(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_ValidateMessageData_Test_MessageIdUnusedValid */ +} void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthTooHigh(void) { @@ -2284,8 +2220,7 @@ void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthTooHigh(void) UtAssert_True (Result == SCH_MDT_INVALID_LENGTH, "Result == SCH_MDT_INVALID_LENGTH"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateMessageData_Test_MessageIdValidRangeLengthTooHigh */ +} void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthTooLow(void) { @@ -2316,8 +2251,7 @@ void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthTooLow(void) UtAssert_True (Result == SCH_MDT_INVALID_LENGTH, "Result == SCH_MDT_INVALID_LENGTH"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateMessageData_Test_MessageIdValidRangeLengthTooLow */ +} void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthOdd(void) { @@ -2348,8 +2282,7 @@ void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthOdd(void) UtAssert_True (Result == SCH_MDT_INVALID_LENGTH, "Result == SCH_MDT_INVALID_LENGTH"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateMessageData_Test_MessageIdValidRangeLengthOdd */ +} void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthValid(void) { @@ -2376,8 +2309,7 @@ void SCH_ValidateMessageData_Test_MessageIdValidRangeLengthValid(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_ValidateMessageData_Test_MessageIdValidRangeLengthValid */ +} void SCH_ValidateMessageData_Test_MessageIdOther(void) { @@ -2408,8 +2340,7 @@ void SCH_ValidateMessageData_Test_MessageIdOther(void) UtAssert_True (Result == SCH_MDT_BAD_MSG_ID, "Result == SCH_MDT_BAD_MSG_ID"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 2, "Ut_CFE_EVS_GetEventQueueDepth() == 2"); - -} /* end SCH_ValidateMessageData_Test_MessageIdOther */ +} void SCH_App_Test_AddTestCases(void) { @@ -2499,9 +2430,4 @@ void SCH_App_Test_AddTestCases(void) UtTest_Add(SCH_ValidateMessageData_Test_MessageIdValidRangeLengthOdd, SCH_Test_Setup, SCH_Test_TearDown, "SCH_ValidateMessageData_Test_MessageIdValidRangeLengthOdd"); UtTest_Add(SCH_ValidateMessageData_Test_MessageIdValidRangeLengthValid, SCH_Test_Setup, SCH_Test_TearDown, "SCH_ValidateMessageData_Test_MessageIdValidRangeLengthValid"); UtTest_Add(SCH_ValidateMessageData_Test_MessageIdOther, SCH_Test_Setup, SCH_Test_TearDown, "SCH_ValidateMessageData_Test_MessageIdOther"); - -} /* end SCH_App_Test_AddTestCases */ - -/************************/ -/* End of File Comment */ -/************************/ +} diff --git a/fsw/unit_test/sch_app_test.h b/fsw/unit_test/sch_app_test.h index 0cca35e..f21fd21 100644 --- a/fsw/unit_test/sch_app_test.h +++ b/fsw/unit_test/sch_app_test.h @@ -24,8 +24,3 @@ */ void SCH_App_Test_AddTestCases(void); - - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/unit_test/sch_cmds_test.c b/fsw/unit_test/sch_cmds_test.c index 0d35978..8992c31 100644 --- a/fsw/unit_test/sch_cmds_test.c +++ b/fsw/unit_test/sch_cmds_test.c @@ -28,11 +28,11 @@ #include "ut_osapi_stubs.h" #include "ut_cfe_es_stubs.h" #include "ut_cfe_es_hooks.h" -// FIXME: these need to be implemented/updated in UT-Assert (by copying from sch_test_utils.c/.h): -//#include "ut_cfe_evs_stubs.h" -//#include "ut_cfe_time_stubs.h" -//#include "ut_ostimer_stubs.h" -//#include "ut_cfe_sb_stubs.h" +/* FIXME: these need to be implemented/updated in UT-Assert (by copying from sch_test_utils.c/.h): */ +/* #include "ut_cfe_evs_stubs.h" */ +/* #include "ut_cfe_time_stubs.h" */ +/* #include "ut_ostimer_stubs.h" */ +/* #include "ut_cfe_sb_stubs.h" */ #include "ut_cfe_psp_memutils_stubs.h" #include "ut_cfe_psp_watchdog_stubs.h" #include "ut_cfe_psp_timer_stubs.h" @@ -64,8 +64,7 @@ void SCH_AppPipe_Test_SendHK(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_AppPipe_Test_SendHK */ +} void SCH_AppPipe_Test_Noop(void) { @@ -83,8 +82,7 @@ void SCH_AppPipe_Test_Noop(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppPipe_Test_Noop */ +} void SCH_AppPipe_Test_Reset(void) { @@ -102,8 +100,7 @@ void SCH_AppPipe_Test_Reset(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppPipe_Test_Reset */ +} void SCH_AppPipe_Test_Enable(void) { @@ -125,8 +122,7 @@ void SCH_AppPipe_Test_Enable(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppPipe_Test_Enable */ +} void SCH_AppPipe_Test_Disable(void) { @@ -148,8 +144,7 @@ void SCH_AppPipe_Test_Disable(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppPipe_Test_Disable */ +} void SCH_AppPipe_Test_EnableGroupCmd(void) { @@ -167,8 +162,7 @@ void SCH_AppPipe_Test_EnableGroupCmd(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppPipe_Test_EnableGroupCmd */ +} void SCH_AppPipe_Test_DisableGroupCmd(void) { @@ -186,8 +180,7 @@ void SCH_AppPipe_Test_DisableGroupCmd(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppPipe_Test_DisableGroupCmd */ +} void SCH_AppPipe_Test_EnableSyncCmd(void) { @@ -205,8 +198,7 @@ void SCH_AppPipe_Test_EnableSyncCmd(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppPipe_Test_EnableSyncCmd */ +} void SCH_AppPipe_Test_SendDiagTlmCmd(void) { @@ -224,8 +216,7 @@ void SCH_AppPipe_Test_SendDiagTlmCmd(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_AppPipe_Test_SendDiagTlmCmd */ +} void SCH_AppPipe_Test_InvalidCommandCode(void) { @@ -247,8 +238,7 @@ void SCH_AppPipe_Test_InvalidCommandCode(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_AppPipe_Test_InvalidCommandCode */ +} void SCH_AppPipe_Test_InvalidMessageID(void) { @@ -268,8 +258,7 @@ void SCH_AppPipe_Test_InvalidMessageID(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_AppPipe_Test_InvalidMessageID */ +} void SCH_HousekeepingCmd_Test(void) { @@ -335,8 +324,7 @@ void SCH_HousekeepingCmd_Test(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_HousekeepingCmd_Test */ +} void SCH_NoopCmd_Test_Error(void) { @@ -352,8 +340,7 @@ void SCH_NoopCmd_Test_Error(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_NoopCmd_Test_Error */ +} void SCH_NoopCmd_Test_Nominal(void) { @@ -372,8 +359,7 @@ void SCH_NoopCmd_Test_Nominal(void) UtAssert_True (SCH_AppData.CmdCounter == 1, "SCH_AppData.CmdCounter == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_NoopCmd_Test_Nominal */ +} void SCH_ResetCmd_Test_Error(void) { @@ -389,8 +375,7 @@ void SCH_ResetCmd_Test_Error(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_ResetCmd_Test_Error */ +} void SCH_ResetCmd_Test_Nominal(void) { @@ -424,8 +409,7 @@ void SCH_ResetCmd_Test_Nominal(void) UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_ResetCmd_Test_Nominal */ +} void SCH_EnableCmd_Test_InvalidCmdLength(void) { @@ -439,8 +423,7 @@ void SCH_EnableCmd_Test_InvalidCmdLength(void) /* Verify results */ UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_EnableCmd_Test_InvalidCmdLength */ +} void SCH_EnableCmd_Test_InvalidArgumentSlotNumber(void) { @@ -460,8 +443,7 @@ void SCH_EnableCmd_Test_InvalidArgumentSlotNumber(void) "ENABLE cmd: invalid argument, slot=100 (<100), entry=1 (<5)"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_EnableCmd_Test_InvalidArgumentSlotNumber */ +} void SCH_EnableCmd_Test_InvalidArgumentEntryNumber(void) { @@ -481,8 +463,7 @@ void SCH_EnableCmd_Test_InvalidArgumentEntryNumber(void) "ENABLE cmd: invalid argument, slot=1 (<100), entry=5 (<5)"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_EnableCmd_Test_InvalidArgumentEntryNumber */ +} void SCH_EnableCmd_Test_InvalidState(void) { @@ -504,8 +485,7 @@ void SCH_EnableCmd_Test_InvalidState(void) "ENABLE command: invalid state = 99, slot = 0, entry = 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_EnableCmd_Test_InvalidState */ +} void SCH_EnableCmd_Test_Nominal(void) { @@ -529,8 +509,7 @@ void SCH_EnableCmd_Test_Nominal(void) "ENABLE command: invalid state = 99, slot = 0, entry = 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_EnableCmd_Test_Nominal */ +} void SCH_DisableCmd_Test_InvalidCmdLength(void) { @@ -544,8 +523,7 @@ void SCH_DisableCmd_Test_InvalidCmdLength(void) /* Verify results */ UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_DisableCmd_Test_InvalidCmdLength */ +} void SCH_DisableCmd_Test_InvalidArgumentSlotNumber(void) { @@ -565,8 +543,7 @@ void SCH_DisableCmd_Test_InvalidArgumentSlotNumber(void) "DISABLE cmd: invalid argument, slot=100 (<100), entry=1 (<5)"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_DisableCmd_Test_InvalidArgumentSlotNumber */ +} void SCH_DisableCmd_Test_InvalidArgumentEntryNumber(void) { @@ -586,8 +563,7 @@ void SCH_DisableCmd_Test_InvalidArgumentEntryNumber(void) "DISABLE cmd: invalid argument, slot=1 (<100), entry=5 (<5)"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_DisableCmd_Test_InvalidArgumentEntryNumber */ +} void SCH_DisableCmd_Test_InvalidState(void) { @@ -609,8 +585,7 @@ void SCH_DisableCmd_Test_InvalidState(void) "DISABLE command: invalid state = 99, slot = 0, entry = 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_DisableCmd_Test_InvalidState */ +} void SCH_DisableCmd_Test_Nominal(void) { @@ -634,8 +609,7 @@ void SCH_DisableCmd_Test_Nominal(void) "DISABLE command: invalid state = 99, slot = 0, entry = 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_DisableCmd_Test_Nominal */ +} void SCH_EnableGroupCmd_Test_InvalidCmdLength(void) { @@ -649,8 +623,7 @@ void SCH_EnableGroupCmd_Test_InvalidCmdLength(void) /* Verify results */ UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_EnableGroupCmd_Test_InvalidCmdLength */ +} void SCH_EnableGroupCmd_Test_InvalidArgument(void) { @@ -667,8 +640,7 @@ void SCH_EnableGroupCmd_Test_InvalidArgument(void) "ENABLE GROUP command: invalid argument, no groups selected"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_EnableGroupCmd_Test_InvalidArgument */ +} void SCH_EnableGroupCmd_Test_NominalCmdGroupNumberNotUnused(void) { @@ -692,8 +664,7 @@ void SCH_EnableGroupCmd_Test_NominalCmdGroupNumberNotUnused(void) "ENABLE GROUP command: match count = 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_EnableGroupCmd_Test_NominalCmdGroupNumberNotUnused */ +} void SCH_EnableGroupCmd_Test_NominalCmdMultiGroupBitwiseAndTblMultiGroupNotUnused(void) { @@ -717,8 +688,7 @@ void SCH_EnableGroupCmd_Test_NominalCmdMultiGroupBitwiseAndTblMultiGroupNotUnuse "ENABLE GROUP command: match count = 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_EnableGroupCmd_Test_NominalCmdMultiGroupBitwiseAndTblMultiGroupNotUnused */ +} void SCH_EnableGroupCmd_Test_GroupNotFound(void) { @@ -738,8 +708,7 @@ void SCH_EnableGroupCmd_Test_GroupNotFound(void) "ENABLE GROUP command: Neither Group 255 nor Multi-Group 0xFFFFFF found"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_EnableGroupCmd_Test_GroupNotFound */ +} void SCH_DisableGroupCmd_Test_InvalidCmdLength(void) { @@ -753,8 +722,7 @@ void SCH_DisableGroupCmd_Test_InvalidCmdLength(void) /* Verify results */ UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_DisableGroupCmd_Test_InvalidCmdLength */ +} void SCH_DisableGroupCmd_Test_InvalidArgument(void) { @@ -771,8 +739,7 @@ void SCH_DisableGroupCmd_Test_InvalidArgument(void) "DISABLE GROUP command: invalid argument, no groups selected"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_DisableGroupCmd_Test_InvalidArgument */ +} void SCH_DisableGroupCmd_Test_NominalCmdGroupNumberNotUnused(void) { @@ -796,8 +763,7 @@ void SCH_DisableGroupCmd_Test_NominalCmdGroupNumberNotUnused(void) "DISABLE GROUP command: match count = 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_DisableGroupCmd_Test_NominalCmdGroupNumberNotUnused */ +} void SCH_DisableGroupCmd_Test_NominalCmdMultiGroupBitwiseAndTblMultiGroupNotUnused(void) { @@ -821,8 +787,7 @@ void SCH_DisableGroupCmd_Test_NominalCmdMultiGroupBitwiseAndTblMultiGroupNotUnus "DISABLE GROUP command: match count = 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_DisableGroupCmd_Test_NominalCmdMultiGroupBitwiseAndTblMultiGroupNotUnused */ +} void SCH_DisableGroupCmd_Test_GroupNotFound(void) { @@ -842,8 +807,7 @@ void SCH_DisableGroupCmd_Test_GroupNotFound(void) "DISABLE GROUP command: Neither Group 255 nor Multi-Group 0xFFFFFF found"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_DisableGroupCmd_Test_GroupNotFound */ +} void SCH_EnableSyncCmd_Test_InvalidCmdLength(void) { @@ -857,8 +821,7 @@ void SCH_EnableSyncCmd_Test_InvalidCmdLength(void) /* Verify results */ UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_EnableSyncCmd_Test_InvalidCmdLength */ +} void SCH_EnableSyncCmd_Test_Nominal(void) { @@ -879,8 +842,7 @@ void SCH_EnableSyncCmd_Test_Nominal(void) "Major Frame Synchronization Enabled"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_EnableSyncCmd_Test_Nominal */ +} void SCH_SendDiagTlmCmd_Test_InvalidCmdLength(void) { @@ -894,8 +856,7 @@ void SCH_SendDiagTlmCmd_Test_InvalidCmdLength(void) /* Verify results */ UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); /* Generates 1 event message we don't care about in this test */ - -} /* end SCH_SendDiagTlmCmd_Test_InvalidCmdLength */ +} void SCH_SendDiagTlmCmd_Test_Enabled(void) { @@ -916,8 +877,7 @@ void SCH_SendDiagTlmCmd_Test_Enabled(void) "Transmitting Diagnostic Message"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_SendDiagTlmCmd_Test_Enabled */ +} void SCH_SendDiagTlmCmd_Test_Disabled(void) { @@ -938,8 +898,7 @@ void SCH_SendDiagTlmCmd_Test_Disabled(void) "Transmitting Diagnostic Message"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_SendDiagTlmCmd_Test_Disabled */ +} void SCH_SendDiagTlmCmd_Test_Other(void) { @@ -961,8 +920,7 @@ void SCH_SendDiagTlmCmd_Test_Other(void) "Transmitting Diagnostic Message"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_SendDiagTlmCmd_Test_Other */ +} void SCH_AcquirePointers_Test_AllResultsGreaterThanSuccess(void) { @@ -979,8 +937,7 @@ void SCH_AcquirePointers_Test_AllResultsGreaterThanSuccess(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_AcquirePointers_Test_AllResultsGreaterThanSuccess */ +} void SCH_AcquirePointers_Test_AllResultsSuccess(void) { @@ -997,8 +954,7 @@ void SCH_AcquirePointers_Test_AllResultsSuccess(void) UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_AcquirePointers_Test_AllResultsSuccess */ +} void SCH_AcquirePointers_Test_Result1LessThanSuccess(void) { @@ -1014,8 +970,7 @@ void SCH_AcquirePointers_Test_Result1LessThanSuccess(void) UtAssert_True(Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_AcquirePointers_Test_Result1LessThanSuccess */ +} void SCH_VerifyCmdLength_Test_LengthError(void) { @@ -1036,8 +991,7 @@ void SCH_VerifyCmdLength_Test_LengthError(void) UtAssert_True(Result == SCH_BAD_MSG_LENGTH_RC, "Result == SCH_BAD_MSG_LENGTH_RC"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 1, "Ut_CFE_EVS_GetEventQueueDepth() == 1"); - -} /* end SCH_VerifyCmdLength_Test_LengthError */ +} void SCH_VerifyCmdLength_Test_Success(void) { @@ -1054,8 +1008,7 @@ void SCH_VerifyCmdLength_Test_Success(void) UtAssert_True(Result == SCH_SUCCESS, "Result == SCH_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_VerifyCmdLength_Test_Success */ +} void SCH_PostCommandResult_Test_GoodCommand(void) { @@ -1068,8 +1021,7 @@ void SCH_PostCommandResult_Test_GoodCommand(void) UtAssert_True(SCH_AppData.CmdCounter == 1, "SCH_AppData.CmdCounter == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_PostCommandResult_Test_GoodCommand */ +} void SCH_PostCommandResult_Test_Error(void) { @@ -1082,8 +1034,7 @@ void SCH_PostCommandResult_Test_Error(void) UtAssert_True(SCH_AppData.ErrCounter == 1, "SCH_AppData.ErrCounter == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_PostCommandResult_Test_Error */ +} void SCH_Cmds_Test_AddTestCases(void) { @@ -1148,9 +1099,4 @@ void SCH_Cmds_Test_AddTestCases(void) UtTest_Add(SCH_PostCommandResult_Test_GoodCommand, SCH_Test_Setup, SCH_Test_TearDown, "SCH_PostCommandResult_Test_GoodCommand"); UtTest_Add(SCH_PostCommandResult_Test_Error, SCH_Test_Setup, SCH_Test_TearDown, "SCH_PostCommandResult_Test_Error"); - -} /* end SCH_Cmds_Test_AddTestCases */ - -/************************/ -/* End of File Comment */ -/************************/ +} diff --git a/fsw/unit_test/sch_cmds_test.h b/fsw/unit_test/sch_cmds_test.h index c55896e..26f2336 100644 --- a/fsw/unit_test/sch_cmds_test.h +++ b/fsw/unit_test/sch_cmds_test.h @@ -24,8 +24,3 @@ */ void SCH_Cmds_Test_AddTestCases(void); - - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/unit_test/sch_custom_test.c b/fsw/unit_test/sch_custom_test.c index 8c2c315..5b99249 100644 --- a/fsw/unit_test/sch_custom_test.c +++ b/fsw/unit_test/sch_custom_test.c @@ -27,11 +27,11 @@ #include "ut_osapi_stubs.h" #include "ut_cfe_es_stubs.h" #include "ut_cfe_es_hooks.h" -// FIXME: these need to be implemented/updated in UT-Assert (by copying from sch_test_utils.c/.h): -//#include "ut_cfe_evs_stubs.h" -//#include "ut_cfe_time_stubs.h" -//#include "ut_ostimer_stubs.h" -//#include "ut_cfe_sb_stubs.h" +/* FIXME: these need to be implemented/updated in UT-Assert (by copying from sch_test_utils.c/.h): */ +/* #include "ut_cfe_evs_stubs.h" */ +/* #include "ut_cfe_time_stubs.h" */ +/* #include "ut_ostimer_stubs.h" */ +/* #include "ut_cfe_sb_stubs.h" */ #include "ut_cfe_psp_memutils_stubs.h" #include "ut_cfe_psp_watchdog_stubs.h" #include "ut_cfe_psp_timer_stubs.h" @@ -55,8 +55,7 @@ void SCH_CustomEarlyInit_Test(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_CustomEarlyInit_Test */ +} void SCH_CustomLateInit_Test_Nominal(void) { @@ -69,8 +68,7 @@ void SCH_CustomLateInit_Test_Nominal(void) UtAssert_True (Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_CustomLateInit_Test_Nominal */ +} void SCH_CustomLateInit_Test_RegisterSynchCallbackError(void) { @@ -86,8 +84,7 @@ void SCH_CustomLateInit_Test_RegisterSynchCallbackError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_CustomLateInit_Test_RegisterSynchCallbackError */ +} void SCH_CustomLateInit_Test_TimerSetError(void) { @@ -107,8 +104,7 @@ void SCH_CustomLateInit_Test_TimerSetError(void) UtAssert_True (Result == -1, "Result == -1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_CustomLateInit_Test_TimerSetError */ +} void SCH_CustomGetCurrentSlotNumber_Test_LowCurrentSlot(void) { @@ -124,8 +120,7 @@ void SCH_CustomGetCurrentSlotNumber_Test_LowCurrentSlot(void) UtAssert_True (Result == SCH_TOTAL_SLOTS - 10, "Result == SCH_TOTAL_SLOTS - 10"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_CustomGetCurrentSlotNumber_Test_LowCurrentSlot */ +} void SCH_CustomGetCurrentSlotNumber_Test_HighCurrentSlot(void) { @@ -144,8 +139,7 @@ void SCH_CustomGetCurrentSlotNumber_Test_HighCurrentSlot(void) UtAssert_True (Result == 1, "Result == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_CustomGetCurrentSlotNumber_Test_HighCurrentSlot */ +} void SCH_CustomGetCurrentSlotNumber_Test_NotSynchronized(void) { @@ -161,8 +155,7 @@ void SCH_CustomGetCurrentSlotNumber_Test_NotSynchronized(void) UtAssert_True (Result == 10, "Result == 10"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_CustomGetCurrentSlotNumber_Test_NotSynchronized */ +} void SCH_CustomCleanup_Test(void) { @@ -171,8 +164,7 @@ void SCH_CustomCleanup_Test(void) /* Verify results */ UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_CustomCleanup_Test */ +} void SCH_GetMETSlotNumber_Test_Rollover(void) { @@ -188,8 +180,7 @@ void SCH_GetMETSlotNumber_Test_Rollover(void) UtAssert_True (Result == 0, "Result == 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_GetMETSlotNumber_Test_Rollover */ +} void SCH_GetMETSlotNumber_Test_NoRollover(void) { @@ -205,8 +196,7 @@ void SCH_GetMETSlotNumber_Test_NoRollover(void) UtAssert_True (Result == 1, "Result == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_GetMETSlotNumber_Test_NoRollover */ +} void SCH_MajorFrameCallback_Test_NoisyNotSynchronized(void) { @@ -229,8 +219,7 @@ void SCH_MajorFrameCallback_Test_NoisyNotSynchronized(void) UtAssert_True (SCH_AppData.LastSyncMETSlot == 1, "SCH_AppData.LastSyncMETSlot == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_MajorFrameCallback_Test_NoisyNotSynchronized */ +} void SCH_MajorFrameCallback_Test_NoisySynchronized(void) { @@ -253,8 +242,7 @@ void SCH_MajorFrameCallback_Test_NoisySynchronized(void) UtAssert_True (SCH_AppData.LastSyncMETSlot == 1, "SCH_AppData.LastSyncMETSlot == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_MajorFrameCallback_Test_NoisySynchronized */ +} void SCH_MajorFrameCallback_Test_FrameOccurredWhenExpected(void) { @@ -278,8 +266,7 @@ void SCH_MajorFrameCallback_Test_FrameOccurredWhenExpected(void) UtAssert_True (SCH_AppData.LastSyncMETSlot == 1, "SCH_AppData.LastSyncMETSlot == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_MajorFrameCallback_Test_FrameOccurredWhenExpected */ +} #define CFE_TIME_FLAG_FLYING 1 void SCH_MajorFrameCallback_Test_FlywheelMode(void) @@ -297,8 +284,7 @@ void SCH_MajorFrameCallback_Test_FlywheelMode(void) UtAssert_True (SCH_AppData.LastSyncMETSlot == 1, "SCH_AppData.LastSyncMETSlot == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_MajorFrameCallback_Test_FlywheelMode */ +} void SCH_MinorFrameCallback_Test_SyncAttemptsLeft(void) { @@ -319,8 +305,7 @@ void SCH_MinorFrameCallback_Test_SyncAttemptsLeft(void) UtAssert_True(SCH_AppData.LastSyncMETSlot == 0, "SCH_AppData.LastSyncMETSlot == 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_MinorFrameCallback_Test_SyncAttemptsLeft */ +} void SCH_MinorFrameCallback_Test_SynchronizationAchievedNominal(void) { @@ -339,8 +324,7 @@ void SCH_MinorFrameCallback_Test_SynchronizationAchievedNominal(void) UtAssert_True(SCH_AppData.LastSyncMETSlot == 0, "SCH_AppData.LastSyncMETSlot == 0"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_MinorFrameCallback_Test_SynchronizationAchievedNominal */ +} void SCH_MinorFrameCallback_Test_AlreadySynchronizedNominal(void) { @@ -355,8 +339,7 @@ void SCH_MinorFrameCallback_Test_AlreadySynchronizedNominal(void) UtAssert_True(SCH_AppData.MinorFramesSinceTone == 1, "SCH_AppData.MinorFramesSinceTone == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_MinorFrameCallback_Test_AlreadySynchronizedNominal */ +} void SCH_MinorFrameCallback_Test_AlreadySynchronizedRollover(void) { @@ -373,8 +356,7 @@ void SCH_MinorFrameCallback_Test_AlreadySynchronizedRollover(void) UtAssert_True(SCH_AppData.MissedMajorFrameCount == 1, "SCH_AppData.MissedMajorFrameCount == 1"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_MinorFrameCallback_Test_AlreadySynchronizedRollover */ +} void SCH_MinorFrameCallback_Test_AlreadySynchronizedStartTimer(void) { @@ -390,8 +372,7 @@ void SCH_MinorFrameCallback_Test_AlreadySynchronizedStartTimer(void) UtAssert_True(SCH_AppData.MinorFramesSinceTone == SCH_TIME_SYNC_SLOT, "SCH_AppData.MinorFramesSinceTone == SCH_TIME_SYNC_SLOT"); UtAssert_True (Ut_CFE_EVS_GetEventQueueDepth() == 0, "Ut_CFE_EVS_GetEventQueueDepth() == 0"); - -} /* end SCH_MinorFrameCallback_Test_AlreadySynchronizedStartTimer */ +} void SCH_Custom_Test_AddTestCases(void) { @@ -420,9 +401,4 @@ void SCH_Custom_Test_AddTestCases(void) UtTest_Add(SCH_MinorFrameCallback_Test_AlreadySynchronizedNominal, SCH_Test_Setup, SCH_Test_TearDown, "SCH_MinorFrameCallback_Test_AlreadySynchronizedNominal"); UtTest_Add(SCH_MinorFrameCallback_Test_AlreadySynchronizedRollover, SCH_Test_Setup, SCH_Test_TearDown, "SCH_MinorFrameCallback_Test_AlreadySynchronizedRollover"); UtTest_Add(SCH_MinorFrameCallback_Test_AlreadySynchronizedStartTimer, SCH_Test_Setup, SCH_Test_TearDown, "SCH_MinorFrameCallback_Test_AlreadySynchronizedStartTimer"); - -} /* end SCH_Custom_Test_AddTestCases */ - -/************************/ -/* End of File Comment */ -/************************/ +} diff --git a/fsw/unit_test/sch_custom_test.h b/fsw/unit_test/sch_custom_test.h index f59634e..e4280ab 100644 --- a/fsw/unit_test/sch_custom_test.h +++ b/fsw/unit_test/sch_custom_test.h @@ -24,8 +24,3 @@ */ void SCH_Custom_Test_AddTestCases(void); - - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/unit_test/sch_test_utils.c b/fsw/unit_test/sch_test_utils.c index 9ce6991..feb3843 100644 --- a/fsw/unit_test/sch_test_utils.c +++ b/fsw/unit_test/sch_test_utils.c @@ -43,12 +43,12 @@ void SCH_Test_Setup(void) Ut_OSAPI_Reset(); Ut_OSFILEAPI_Reset(); Ut_OSTIMER_Reset(); -} /* end SCH_Test_Setup */ +} void SCH_Test_TearDown(void) { /* cleanup test environment */ -} /* end SCH_Test_TearDown */ +} /* * Additional UT-Assert Stub Functions and Required Data Structures @@ -1080,7 +1080,3 @@ int32 CFE_SB_CleanUpApp (uint32 AppId) } /* end ut_cfe_sb_stubs */ - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/unit_test/sch_test_utils.h b/fsw/unit_test/sch_test_utils.h index 41c87aa..fd7cbcc 100644 --- a/fsw/unit_test/sch_test_utils.h +++ b/fsw/unit_test/sch_test_utils.h @@ -18,10 +18,10 @@ #include "sch_app.h" #include "ut_cfe_evs_hooks.h" -// FIXME: these need to be implemented/updated in UT-Assert (by copying from sch_test_utils.c/.h): -//#include "ut_cfe_evs_stubs.h" -//#include "ut_cfe_time_stubs.h" -//#include "ut_ostimer_stubs.h" +/* FIXME: these need to be implemented/updated in UT-Assert (by copying from sch_test_utils.c/.h): */ +/* #include "ut_cfe_evs_stubs.h" */ +/* #include "ut_cfe_time_stubs.h" */ +/* #include "ut_ostimer_stubs.h" */ #include "ut_cfe_sb_stubs.h" #include "ut_cfe_sb_hooks.h" #include "ut_cfe_time_hooks.h" @@ -167,7 +167,3 @@ void Ut_CFE_TIME_SetReturnCode(uint32 Index, int32 RtnVal, uint32 CallCnt); void Ut_CFE_TIME_ContinueReturnCodeAfterCountZero(uint32 Index); /* end ut_cfe_time_stubs */ - -/************************/ -/* End of File Comment */ -/************************/ diff --git a/fsw/unit_test/sch_testrunner.c b/fsw/unit_test/sch_testrunner.c index fe8646b..43ae984 100644 --- a/fsw/unit_test/sch_testrunner.c +++ b/fsw/unit_test/sch_testrunner.c @@ -34,9 +34,4 @@ int main(void) SCH_Custom_Test_AddTestCases(); return(UtTest_Run()); -} /* end main */ - - -/************************/ -/* End of File Comment */ -/************************/ +} diff --git a/test_and_ground/itos/rec/SCH_HK_LE.rec b/test_and_ground/itos/rec/SCH_HK_LE.rec index 89ac5c3..0c147f6 100644 --- a/test_and_ground/itos/rec/SCH_HK_LE.rec +++ b/test_and_ground/itos/rec/SCH_HK_LE.rec @@ -30,7 +30,6 @@ CfeTelemetryPacket FSW_SCH_HkPkt I1 SCH_IgnoreMajorFrame {generateMnemonic="no"} I1 SCH_UnexpectedMajorFrame {generateMnemonic="no"} - } /* Define the mnemonics */