From a96fa151d84ebe75f24221f8d9860b008cd585ca Mon Sep 17 00:00:00 2001 From: Avi Date: Sun, 9 Oct 2022 16:22:29 +1000 Subject: [PATCH] Clean up empty lines --- fsw/src/hs_app.c | 6 --- fsw/src/hs_cmds.c | 5 --- fsw/src/hs_custom.c | 5 --- fsw/src/hs_custom.h | 1 - fsw/src/hs_monitors.c | 14 ------- fsw/src/hs_msg.h | 1 - fsw/src/hs_utils.c | 2 - fsw/tables/hs_amt.c | 1 - fsw/tables/hs_emt.c | 1 - fsw/tables/hs_mat.c | 1 - fsw/tables/hs_xct.c | 1 - unit-test/hs_app_tests.c | 47 ---------------------- unit-test/hs_cmds_tests.c | 73 ----------------------------------- unit-test/hs_custom_tests.c | 26 ------------- unit-test/hs_monitors_tests.c | 63 ------------------------------ unit-test/hs_utils_tests.c | 3 -- 16 files changed, 250 deletions(-) diff --git a/fsw/src/hs_app.c b/fsw/src/hs_app.c index 56ebdfc..9fba8b6 100644 --- a/fsw/src/hs_app.c +++ b/fsw/src/hs_app.c @@ -192,7 +192,6 @@ void HS_AppMain(void) ** Exit the application */ CFE_ES_ExitApp(RunStatus); - } /* end HS_AppMain */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -340,7 +339,6 @@ int32 HS_AppInit(void) HS_MAJOR_VERSION, HS_MINOR_VERSION, HS_REVISION, HS_MISSION_REV); return Status; - } /* end HS_AppInit */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -414,7 +412,6 @@ int32 HS_SbInit(void) */ return Status; - } /* End of HS_SbInit() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -531,7 +528,6 @@ int32 HS_TblInit(void) HS_AcquirePointers(); return CFE_SUCCESS; - } /* End of HS_TblInit() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -602,7 +598,6 @@ int32 HS_ProcessMain(void) } return Status; - } /* End of HS_ProcessMain() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -670,7 +665,6 @@ int32 HS_ProcessCommands(void) } return Status; - } /* End of HS_ProcessCommands() */ /************************/ diff --git a/fsw/src/hs_cmds.c b/fsw/src/hs_cmds.c index 05540f4..9bdc11e 100644 --- a/fsw/src/hs_cmds.c +++ b/fsw/src/hs_cmds.c @@ -48,7 +48,6 @@ void HS_AppPipe(const CFE_SB_Buffer_t *BufPtr) switch (CFE_SB_MsgIdToValue(MessageID)) { - /* ** Housekeeping telemetry request */ @@ -239,7 +238,6 @@ void HS_HousekeepingReq(const CFE_SB_Buffer_t *BufPtr) */ for (TableIndex = 0; TableIndex < HS_MAX_EXEC_CNT_SLOTS; TableIndex++) { - ExeCount = HS_INVALID_EXECOUNT; if (HS_AppData.ExeCountState == HS_STATE_ENABLED) @@ -410,7 +408,6 @@ void HS_EnableEventMonCmd(const CFE_SB_Buffer_t *BufPtr) */ if (HS_AppData.CurrentEventMonState == HS_STATE_DISABLED) { - Status = CFE_SB_SubscribeEx(CFE_SB_ValueToMsgId(CFE_EVS_LONG_EVENT_MSG_MID), HS_AppData.EventPipe, CFE_SB_DEFAULT_QOS, HS_EVENT_PIPE_DEPTH); @@ -463,13 +460,11 @@ void HS_DisableEventMonCmd(const CFE_SB_Buffer_t *BufPtr) */ if (HS_VerifyMsgLength(&BufPtr->Msg, ExpectedLength)) { - /* ** Unsubscribe from Event Messages if currently enabled */ if (HS_AppData.CurrentEventMonState == HS_STATE_ENABLED) { - Status = CFE_SB_Unsubscribe(CFE_SB_ValueToMsgId(CFE_EVS_LONG_EVENT_MSG_MID), HS_AppData.EventPipe); if (Status != CFE_SUCCESS) diff --git a/fsw/src/hs_custom.c b/fsw/src/hs_custom.c index 8e9c397..9d1c3ea 100644 --- a/fsw/src/hs_custom.c +++ b/fsw/src/hs_custom.c @@ -54,7 +54,6 @@ void HS_IdleTask(void) while (HS_CustomData.IdleTaskRunStatus == CFE_SUCCESS) { - /* Check to see if we are to mark the time. */ if (((HS_CustomData.ThisIdleTaskExec & HS_CustomData.UtilMask) == HS_CustomData.UtilMask) && (HS_CustomData.ThisIdleTaskExec > HS_CustomData.UtilMask)) @@ -129,7 +128,6 @@ int32 HS_CustomInit(void) HS_CustomData.UtilCallsPerMark = HS_UTIL_CALLS_PER_MARK; return Status; - } /* end HS_CustomInit */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -155,7 +153,6 @@ void HS_CustomCleanup(void) ** Delete the Idle Task */ CFE_ES_DeleteChildTask(HS_CustomData.IdleTaskID); - } /* end HS_CustomCleanup */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -215,7 +212,6 @@ void HS_CustomMonitorUtilization(void) HS_MonitorUtilization(); HS_CustomData.UtilCycleCounter = 0; } - } /* End of HS_CustomMonitorUtilization() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -256,7 +252,6 @@ int32 HS_CustomCommands(const CFE_SB_Buffer_t *BufPtr) } /* end CommandCode switch */ return Status; - } /* End of HS_CustomCommands() */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/fsw/src/hs_custom.h b/fsw/src/hs_custom.h index f69c061..46b89c2 100644 --- a/fsw/src/hs_custom.h +++ b/fsw/src/hs_custom.h @@ -270,7 +270,6 @@ typedef struct int32 IdleTaskRunStatus; /**< \brief HS Idle Task Run Status */ CFE_ES_TaskId_t IdleTaskID; /**< \brief HS Idle Task Task ID */ - } HS_CustomData_t; /** diff --git a/fsw/src/hs_monitors.c b/fsw/src/hs_monitors.c index f63c98d..4a7c33d 100644 --- a/fsw/src/hs_monitors.c +++ b/fsw/src/hs_monitors.c @@ -55,7 +55,6 @@ void HS_MonitorApplications(void) for (TableIndex = 0; TableIndex < HS_MAX_MONITORED_APPS; TableIndex++) { - ActionType = HS_AppData.AMTablePtr[TableIndex].ActionType; /* @@ -106,7 +105,6 @@ void HS_MonitorApplications(void) */ if (HS_AppData.AppMonCheckInCountdown[TableIndex] == 0) { - /* ** Unset the enabled bit flag */ @@ -114,7 +112,6 @@ void HS_MonitorApplications(void) (TableIndex % HS_BITS_PER_APPMON_ENABLE)); switch (ActionType) { - case HS_AMT_ACT_PROC_RESET: CFE_EVS_SendEvent(HS_APPMON_PROC_ERR_EID, CFE_EVS_EventType_ERROR, "App Monitor Failure: APP:(%s): Action: Processor Reset", @@ -245,13 +242,11 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) if (strncmp(HS_AppData.EMTablePtr[TableIndex].AppName, EventPtr->Payload.PacketID.AppName, OS_MAX_API_NAME) == 0) { - /* ** Perform the action if the strings also match */ switch (ActionType) { - case HS_EMT_ACT_PROC_RESET: CFE_EVS_SendEvent(HS_EVENTMON_PROC_ERR_EID, CFE_EVS_EventType_ERROR, "Event Monitor: APP:(%s) EID:(%d): Action: Processor Reset", @@ -339,7 +334,6 @@ void HS_MonitorEvent(const CFE_EVS_LongEventTlm_t *EventPtr) */ if ((HS_AppData.MsgActsState == HS_STATE_ENABLED) && (MsgActsIndex < HS_MAX_MSG_ACT_TYPES)) { - /* ** Send the message if off cooldown and not disabled */ @@ -482,7 +476,6 @@ int32 HS_ValidateAMTable(void *TableData) for (TableIndex = 0; TableIndex < HS_MAX_MONITORED_APPS; TableIndex++) { - ActionType = TableArray[TableIndex].ActionType; CycleCount = TableArray[TableIndex].CycleCount; NullTerm = TableArray[TableIndex].NullTerm; @@ -540,7 +533,6 @@ int32 HS_ValidateAMTable(void *TableData) (int)UnusedCount); return TableResult; - } /* end HS_ValidateAMTable */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -575,7 +567,6 @@ int32 HS_ValidateEMTable(void *TableData) for (TableIndex = 0; TableIndex < HS_MAX_MONITORED_EVENTS; TableIndex++) { - ActionType = TableArray[TableIndex].ActionType; EventID = TableArray[TableIndex].EventID; NullTerm = TableArray[TableIndex].NullTerm; @@ -633,7 +624,6 @@ int32 HS_ValidateEMTable(void *TableData) (int)UnusedCount); return TableResult; - } /* end HS_ValidateEMTable */ #if HS_MAX_EXEC_CNT_SLOTS != 0 @@ -668,7 +658,6 @@ int32 HS_ValidateXCTable(void *TableData) for (TableIndex = 0; TableIndex < HS_MAX_EXEC_CNT_SLOTS; TableIndex++) { - ResourceType = TableArray[TableIndex].ResourceType; NullTerm = TableArray[TableIndex].NullTerm; EntryResult = HS_XCTVAL_NO_ERR; @@ -727,7 +716,6 @@ int32 HS_ValidateXCTable(void *TableData) (int)UnusedCount); return TableResult; - } /* end HS_ValidateXCTable */ #endif @@ -763,7 +751,6 @@ int32 HS_ValidateMATable(void *TableData) for (TableIndex = 0; TableIndex < HS_MAX_MSG_ACT_TYPES; TableIndex++) { - EntryResult = HS_MATVAL_NO_ERR; BufPtr = (CFE_SB_Buffer_t *)&TableArray[TableIndex].MsgBuf; CFE_MSG_GetSize(&BufPtr->Msg, &Length); @@ -828,7 +815,6 @@ int32 HS_ValidateMATable(void *TableData) (int)UnusedCount); return TableResult; - } /* end HS_ValidateMATable */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/fsw/src/hs_msg.h b/fsw/src/hs_msg.h index ed184a4..8467a4b 100644 --- a/fsw/src/hs_msg.h +++ b/fsw/src/hs_msg.h @@ -114,7 +114,6 @@ typedef struct #if HS_MAX_EXEC_CNT_SLOTS != 0 uint32 ExeCounts[HS_MAX_EXEC_CNT_SLOTS]; /**< \brief Execution Counters */ #endif - } HS_HkPacket_t; /**\}*/ diff --git a/fsw/src/hs_utils.c b/fsw/src/hs_utils.c index a91501e..f52ec0f 100644 --- a/fsw/src/hs_utils.c +++ b/fsw/src/hs_utils.c @@ -52,7 +52,6 @@ bool HS_VerifyMsgLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) CFE_MSG_GetSize(MsgPtr, &ActualLength); if (ExpectedLength != ActualLength) { - CFE_MSG_GetMsgId(MsgPtr, &MessageID); CFE_MSG_GetFcnCode(MsgPtr, &CommandCode); @@ -83,7 +82,6 @@ bool HS_VerifyMsgLength(const CFE_MSG_Message_t *MsgPtr, size_t ExpectedLength) } return result; - } /* End of HS_VerifyMsgLength */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ diff --git a/fsw/tables/hs_amt.c b/fsw/tables/hs_amt.c index 4914f52..c239af0 100644 --- a/fsw/tables/hs_amt.c +++ b/fsw/tables/hs_amt.c @@ -69,7 +69,6 @@ HS_AMTEntry_t HS_Default_AppMon_Tbl[HS_MAX_MONITORED_APPS] = { /* 29 */ {"", 0, 10, HS_AMT_ACT_NOACT}, /* 30 */ {"", 0, 10, HS_AMT_ACT_NOACT}, /* 31 */ {"", 0, 10, HS_AMT_ACT_NOACT}, - }; /************************/ diff --git a/fsw/tables/hs_emt.c b/fsw/tables/hs_emt.c index b94a8d6..355afaf 100644 --- a/fsw/tables/hs_emt.c +++ b/fsw/tables/hs_emt.c @@ -53,7 +53,6 @@ HS_EMTEntry_t HS_Default_EventMon_Tbl[HS_MAX_MONITORED_EVENTS] = { /* 13 */ {"", 0, 10, HS_EMT_ACT_NOACT}, /* 14 */ {"", 0, 10, HS_EMT_ACT_NOACT}, /* 15 */ {"", 0, 10, HS_EMT_ACT_NOACT}, - }; /************************/ diff --git a/fsw/tables/hs_mat.c b/fsw/tables/hs_mat.c index b2985b7..4841c59 100644 --- a/fsw/tables/hs_mat.c +++ b/fsw/tables/hs_mat.c @@ -68,7 +68,6 @@ HS_MATEntry_t HS_Default_MsgActs_Tbl[HS_MAX_MSG_ACT_TYPES] = { {HS_MAT_STATE_DISABLED, 10, {{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}}, - }; /************************/ diff --git a/fsw/tables/hs_xct.c b/fsw/tables/hs_xct.c index adf02b2..44e7f55 100644 --- a/fsw/tables/hs_xct.c +++ b/fsw/tables/hs_xct.c @@ -69,7 +69,6 @@ HS_XCTEntry_t HS_Default_ExeCount_Tbl[HS_MAX_EXEC_CNT_SLOTS] = { /* 29 */ {"", 0, HS_XCT_TYPE_NOTYPE}, /* 30 */ {"", 0, HS_XCT_TYPE_NOTYPE}, /* 31 */ {"", 0, HS_XCT_TYPE_NOTYPE}, - }; /************************/ diff --git a/unit-test/hs_app_tests.c b/unit-test/hs_app_tests.c index c652bae..d3b777f 100644 --- a/unit-test/hs_app_tests.c +++ b/unit-test/hs_app_tests.c @@ -127,7 +127,6 @@ int32 HS_APP_TEST_CFE_ES_RestoreFromCDSHook(void *UserObj, int32 StubRetcode, ui int32 HS_APP_TEST_CFE_ES_WaitForStartupSyncHook1(void *UserObj, int32 StubRetcode, uint32 CallCount, const UT_StubContext_t *Context) { - UT_WaitForStartupSyncTimeout = UT_Hook_GetArgValueByName(Context, "TimeOutMilliseconds", uint32); /* This functionality is not directly related to WaitForStartupSync, but WaitForStartupSync is in a place where @@ -186,7 +185,6 @@ void HS_AppMain_Test_NominalWaitForStartupSync(void) /* 1 event message that we don't care about in this test */ UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); - } /* end HS_AppMain_Test_NominalWaitForStartupSync */ void HS_AppMain_Test_NominalRcvMsgSuccess(void) @@ -215,7 +213,6 @@ void HS_AppMain_Test_NominalRcvMsgSuccess(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppMain_Test_NominalRcvMsgSuccess */ void HS_AppMain_Test_NominalRcvMsgNoMessage(void) @@ -248,7 +245,6 @@ void HS_AppMain_Test_NominalRcvMsgNoMessage(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_AppMain_Test_NominalRcvMsgNoMessage */ void HS_AppMain_Test_NominalRcvMsgTimeOut(void) @@ -281,12 +277,10 @@ void HS_AppMain_Test_NominalRcvMsgTimeOut(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_AppMain_Test_NominalRcvMsgTimeOut */ void HS_AppMain_Test_NominalRcvMsgError(void) { - /* Set to make loop execute exactly once */ UT_SetDeferredRetcode(UT_KEY(CFE_ES_RunLoop), 1, true); @@ -316,7 +310,6 @@ void HS_AppMain_Test_NominalRcvMsgError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_AppMain_Test_NominalRcvMsgError */ void HS_AppMain_Test_AppInitNotSuccess(void) @@ -359,7 +352,6 @@ void HS_AppMain_Test_AppInitNotSuccess(void) strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_True(strCmpResult == 0, "Sys Log string matched expected result, '%s'", context_CFE_ES_WriteToSysLog.Spec); - } /* end HS_AppMain_Test_AppInitNotSuccess */ void HS_AppMain_Test_ProcessMainNotSuccess(void) @@ -395,7 +387,6 @@ void HS_AppMain_Test_ProcessMainNotSuccess(void) strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_True(strCmpResult == 0, "Sys Log string matched expected result, '%s'", context_CFE_ES_WriteToSysLog.Spec); - } /* end HS_AppMain_Test_ProcessMainNotSuccess */ void HS_AppMain_Test_SBSubscribeEVSLongError(void) @@ -452,7 +443,6 @@ void HS_AppMain_Test_SBSubscribeEVSLongError(void) strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_True(strCmpResult == 0, "Sys Log string matched expected result, '%s'", context_CFE_ES_WriteToSysLog.Spec); - } /* HS_AppMain_Test_SBSubscribeEVSLongError */ void HS_AppMain_Test_SBSubscribeEVSShortError(void) @@ -509,7 +499,6 @@ void HS_AppMain_Test_SBSubscribeEVSShortError(void) strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_True(strCmpResult == 0, "Sys Log string matched expected result, '%s'", context_CFE_ES_WriteToSysLog.Spec); - } /* HS_AppMain_Test_SBSubscribeEVSShortError */ void HS_AppMain_Test_RcvMsgError(void) @@ -551,12 +540,10 @@ void HS_AppMain_Test_RcvMsgError(void) strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_True(strCmpResult == 0, "Sys Log string matched expected result, '%s'", context_CFE_ES_WriteToSysLog.Spec); - } /* HS_AppMain_Test_RcvMsgError */ void HS_AppMain_Test_StateDisabled(void) { - /* Set so the loop will never be run */ UT_SetDeferredRetcode(UT_KEY(CFE_ES_RunLoop), 1, false); @@ -577,7 +564,6 @@ void HS_AppMain_Test_StateDisabled(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppMain_Test_StateDisabled */ void HS_AppInit_Test_Nominal(void) @@ -634,7 +620,6 @@ void HS_AppInit_Test_Nominal(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppInit_Test_Nominal */ void HS_AppInit_Test_EVSRegisterError(void) @@ -687,7 +672,6 @@ void HS_AppInit_Test_EVSRegisterError(void) strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_True(strCmpResult == 0, "Sys Log string matched expected result, '%s'", context_CFE_ES_WriteToSysLog.Spec); - } /* end HS_AppInit_Test_EVSRegisterError */ void HS_AppInit_Test_CorruptCDSResetsPerformed(void) @@ -762,7 +746,6 @@ void HS_AppInit_Test_CorruptCDSResetsPerformed(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_AppInit_Test_CorruptCDSResetsPerformed */ void HS_AppInit_Test_CorruptCDSMaxResets(void) @@ -834,7 +817,6 @@ void HS_AppInit_Test_CorruptCDSMaxResets(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_AppInit_Test_CorruptCDSMaxResets */ void HS_AppInit_Test_CorruptCDSNoEvent(void) @@ -891,7 +873,6 @@ void HS_AppInit_Test_CorruptCDSNoEvent(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppInit_Test_CorruptCDSNoEvent */ void HS_AppInit_Test_RestoreCDSError(void) @@ -945,7 +926,6 @@ void HS_AppInit_Test_RestoreCDSError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_AppInit_Test_RestoreCDSError */ void HS_AppInit_Test_DisableSavingToCDS(void) @@ -1001,7 +981,6 @@ void HS_AppInit_Test_DisableSavingToCDS(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppInit_Test_DisableSavingToCDS */ void HS_AppInit_Test_SBInitError(void) @@ -1059,7 +1038,6 @@ void HS_AppInit_Test_SBInitError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppInit_Test_SBInitError */ void HS_AppInit_Test_TblInitError(void) @@ -1117,7 +1095,6 @@ void HS_AppInit_Test_TblInitError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppInit_Test_TblInitError */ void HS_AppInit_Test_CustomInitError(void) @@ -1175,7 +1152,6 @@ void HS_AppInit_Test_CustomInitError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppInit_Test_TblInitError */ void HS_SbInit_Test_Nominal(void) @@ -1198,7 +1174,6 @@ void HS_SbInit_Test_Nominal(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_SbInit_Test_Nominal */ void HS_SbInit_Test_CreateSBCmdPipeError(void) @@ -1236,7 +1211,6 @@ void HS_SbInit_Test_CreateSBCmdPipeError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SbInit_Test_CreateSBCmdPipeError */ void HS_SbInit_Test_CreateSBEventPipeError(void) @@ -1274,7 +1248,6 @@ void HS_SbInit_Test_CreateSBEventPipeError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SbInit_Test_CreateSBEventPipeError */ void HS_SbInit_Test_CreateSBWakeupPipe(void) @@ -1312,7 +1285,6 @@ void HS_SbInit_Test_CreateSBWakeupPipe(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SbInit_Test_CreateSBWakeupPipe */ void HS_SbInit_Test_SubscribeHKRequestError(void) @@ -1350,7 +1322,6 @@ void HS_SbInit_Test_SubscribeHKRequestError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SbInit_Test_SubscribeHKRequestError */ void HS_SbInit_Test_SubscribeGndCmdsError(void) @@ -1388,7 +1359,6 @@ void HS_SbInit_Test_SubscribeGndCmdsError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SbInit_Test_SubscribeGndCmdsError */ void HS_SbInit_Test_SubscribeWakeupError(void) @@ -1426,7 +1396,6 @@ void HS_SbInit_Test_SubscribeWakeupError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SbInit_Test_SubscribeWakeupError */ void HS_TblInit_Test_Nominal(void) @@ -1446,7 +1415,6 @@ void HS_TblInit_Test_Nominal(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_TblInit_Test_Nominal */ void HS_TblInit_Test_RegisterAppMonTableError(void) @@ -1480,7 +1448,6 @@ void HS_TblInit_Test_RegisterAppMonTableError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_TblInit_Test_RegisterAppMonTableError */ void HS_TblInit_Test_RegisterEventMonTableError(void) @@ -1514,7 +1481,6 @@ void HS_TblInit_Test_RegisterEventMonTableError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_TblInit_Test_RegisterEventMonTableError */ void HS_TblInit_Test_RegisterMsgActsTableError(void) @@ -1548,7 +1514,6 @@ void HS_TblInit_Test_RegisterMsgActsTableError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_TblInit_Test_RegisterMsgActsTableError */ #if HS_MAX_EXEC_CNT_SLOTS != 0 @@ -1583,7 +1548,6 @@ void HS_TblInit_Test_RegisterExeCountTableError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_TblInit_Test_RegisterExeCountTableError */ #endif @@ -1618,7 +1582,6 @@ void HS_TblInit_Test_LoadExeCountTableError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 6, "CFE_EVS_SendEvent was called %u time(s), expected 6", call_count_CFE_EVS_SendEvent); - } /* end HS_TblInit_Test_LoadExeCountTableError */ #endif @@ -1665,7 +1628,6 @@ void HS_TblInit_Test_LoadAppMonTableError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_TblInit_Test_LoadAppMonTableError */ void HS_TblInit_Test_LoadEventMonTableError(void) @@ -1711,7 +1673,6 @@ void HS_TblInit_Test_LoadEventMonTableError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_TblInit_Test_LoadEventMonTableError */ void HS_TblInit_Test_LoadMsgActsTableError(void) @@ -1745,7 +1706,6 @@ void HS_TblInit_Test_LoadMsgActsTableError(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_TblInit_Test_LoadMsgActsTableError */ void HS_ProcessMain_Test(void) @@ -1792,7 +1752,6 @@ void HS_ProcessMain_Test(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_ProcessMain_Test */ void HS_ProcessMain_Test_MonStateDisabled(void) @@ -1839,7 +1798,6 @@ void HS_ProcessMain_Test_MonStateDisabled(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_ProcessMain_Test_MonStateDisabled */ void HS_ProcessMain_Test_AlivenessDisabled(void) @@ -1885,7 +1843,6 @@ void HS_ProcessMain_Test_AlivenessDisabled(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_ProcessMain_Test_AlivenessDisabled */ void HS_ProcessMain_Test_WatchdogDisabled(void) @@ -1934,7 +1891,6 @@ void HS_ProcessMain_Test_WatchdogDisabled(void) UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_ProcessMain_Test_WatchdogDisabled */ void HS_ProcessCommands_Test(void) @@ -1996,7 +1952,6 @@ void HS_ProcessCommands_Test(void) call_count_HS_MonitorEvent); UtAssert_True(HS_AppData.CmdErrCount == 0, "HS_AppData.CmdErrCount == 0"); - } /* end HS_ProcessCommands_Test */ void HS_ProcessCommands_Test_NullMsgPtr(void) @@ -2041,7 +1996,6 @@ void HS_ProcessCommands_Test_NullMsgPtr(void) UtAssert_True(call_count_HS_AppPipe == 0, "HS_AppPipe was called %u time(s), expected 0", call_count_HS_AppPipe); UtAssert_True(HS_AppData.CmdErrCount == 0, "HS_AppData.CmdErrCount == 0"); - } /* end HS_ProcessCommands_Test_NullMsgPtr */ /* @@ -2131,7 +2085,6 @@ void UtTest_Setup(void) UtTest_Add(HS_ProcessCommands_Test, HS_Test_Setup, HS_Test_TearDown, "HS_ProcessCommands_Test"); UtTest_Add(HS_ProcessCommands_Test_NullMsgPtr, HS_Test_Setup, HS_Test_TearDown, "HS_ProcessCommands_Test_NullMsgPtr"); - } /* end UtTest_Setup */ /************************/ diff --git a/unit-test/hs_cmds_tests.c b/unit-test/hs_cmds_tests.c index b25714f..e17c788 100644 --- a/unit-test/hs_cmds_tests.c +++ b/unit-test/hs_cmds_tests.c @@ -80,7 +80,6 @@ void HS_AppPipe_Test_SendHK(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_SendHK */ void HS_AppPipe_Test_Noop(void) @@ -108,7 +107,6 @@ void HS_AppPipe_Test_Noop(void) UtAssert_INT32_EQ(call_count_CFE_EVS_SendEvent, 1); UtAssert_INT32_EQ(HS_AppData.CmdErrCount, 0); UtAssert_INT32_EQ(HS_AppData.CmdCount, 1); - } /* end HS_AppPipe_Test_Noop */ void HS_AppPipe_Test_Reset(void) @@ -135,7 +133,6 @@ void HS_AppPipe_Test_Reset(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_Reset */ void HS_AppPipe_Test_EnableAppMon(void) @@ -167,7 +164,6 @@ void HS_AppPipe_Test_EnableAppMon(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_EnableAppMon */ void HS_AppPipe_Test_DisableAppMon(void) @@ -197,7 +193,6 @@ void HS_AppPipe_Test_DisableAppMon(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_DisableAppMon */ void HS_AppPipe_Test_EnableEventMon(void) @@ -227,7 +222,6 @@ void HS_AppPipe_Test_EnableEventMon(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_EnableEventMon */ void HS_AppPipe_Test_DisableEventMon(void) @@ -257,7 +251,6 @@ void HS_AppPipe_Test_DisableEventMon(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_DisableEventMon */ void HS_AppPipe_Test_EnableAliveness(void) @@ -284,7 +277,6 @@ void HS_AppPipe_Test_EnableAliveness(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_EnableAliveness */ void HS_AppPipe_Test_DisableAliveness(void) @@ -311,7 +303,6 @@ void HS_AppPipe_Test_DisableAliveness(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_DisableAliveness */ void HS_AppPipe_Test_ResetResetsPerformed(void) @@ -338,7 +329,6 @@ void HS_AppPipe_Test_ResetResetsPerformed(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_ResetResetsPerformed */ void HS_AppPipe_Test_SetMaxResets(void) @@ -365,7 +355,6 @@ void HS_AppPipe_Test_SetMaxResets(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_SetMaxResets */ void HS_AppPipe_Test_EnableCPUHog(void) @@ -392,7 +381,6 @@ void HS_AppPipe_Test_EnableCPUHog(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_EnableCPUHog */ void HS_AppPipe_Test_DisableCPUHog(void) @@ -419,7 +407,6 @@ void HS_AppPipe_Test_DisableCPUHog(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_DisableCPUHog */ void HS_AppPipe_Test_InvalidCC(void) @@ -462,7 +449,6 @@ void HS_AppPipe_Test_InvalidCC(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_InvalidCC */ void HS_AppPipe_Test_InvalidCCNoEvent(void) @@ -490,7 +476,6 @@ void HS_AppPipe_Test_InvalidCCNoEvent(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_InvalidCCNoEvent */ void HS_AppPipe_Test_InvalidMID(void) @@ -529,7 +514,6 @@ void HS_AppPipe_Test_InvalidMID(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AppPipe_Test_InvalidMID */ void HS_HousekeepingReq_Test_InvalidEventMon(void) @@ -609,7 +593,6 @@ void HS_HousekeepingReq_Test_InvalidEventMon(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_HousekeepingReq_Test_InvalidEventMon */ void HS_HousekeepingReq_Test_InvalidMsgLength(void) @@ -624,7 +607,6 @@ void HS_HousekeepingReq_Test_InvalidMsgLength(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_HousekeepingReq_Test_InvalidMsgLength */ #if HS_MAX_EXEC_CNT_SLOTS != 0 @@ -719,7 +701,6 @@ void HS_HousekeepingReq_Test_AllFlagsEnabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_HousekeepingReq_Test_AllFlagsEnabled */ #endif @@ -820,7 +801,6 @@ void HS_HousekeepingReq_Test_ResourceTypeAppMain(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_HousekeepingReq_Test_ResourceTypeAppMain */ #endif @@ -920,7 +900,6 @@ void HS_HousekeepingReq_Test_ResourceTypeAppChild(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_HousekeepingReq_Test_ResourceTypeAppChild */ #endif @@ -1022,7 +1001,6 @@ void HS_HousekeepingReq_Test_ResourceTypeAppChildTaskIdError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_HousekeepingReq_Test_ResourceTypeAppChildTaskIdError */ #endif @@ -1120,7 +1098,6 @@ void HS_HousekeepingReq_Test_ResourceTypeAppChildTaskInfoError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_HousekeepingReq_Test_ResourceTypeAppChildTaskInfoError */ #endif @@ -1219,7 +1196,6 @@ void HS_HousekeepingReq_Test_ResourceTypeDevice(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_HousekeepingReq_Test_ResourceTypeDevice */ #endif @@ -1311,7 +1287,6 @@ void HS_HousekeepingReq_Test_ResourceTypeISR(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_HousekeepingReq_Test_ResourceTypeISR */ #endif @@ -1406,7 +1381,6 @@ void HS_HousekeepingReq_Test_ResourceTypeISRGenCounterError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_HousekeepingReq_Test_ResourceTypeISRGenCounterError */ #endif @@ -1503,7 +1477,6 @@ void HS_HousekeepingReq_Test_ResourceTypeUnknown(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 32, "CFE_EVS_SendEvent was called %u time(s), expected 32", call_count_CFE_EVS_SendEvent); - } /* end HS_HousekeepingReq_Test_AllFlagsEnabled */ #endif @@ -1543,7 +1516,6 @@ void HS_Noop_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_Noop_Test */ void HS_Noop_Test_MsgLengthError(void) @@ -1571,7 +1543,6 @@ void HS_Noop_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_Noop_Test_MsgLengthError */ void HS_ResetCmd_Test(void) @@ -1610,7 +1581,6 @@ void HS_ResetCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ResetCmd_Test */ void HS_ResetCmd_Test_MsgLengthError(void) @@ -1638,7 +1608,6 @@ void HS_ResetCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_ResetCmd_Test_MsgLengthError */ void HS_ResetCounters_Test(void) @@ -1660,7 +1629,6 @@ void HS_ResetCounters_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_ResetCounters_Test */ void HS_EnableAppMonCmd_Test(void) @@ -1707,7 +1675,6 @@ void HS_EnableAppMonCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_EnableAppMonCmd_Test */ void HS_EnableAppMonCmd_Test_MsgLengthError(void) @@ -1743,7 +1710,6 @@ void HS_EnableAppMonCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_EnableAppMonCmd_Test_MsgLengthError */ void HS_DisableAppMonCmd_Test(void) @@ -1785,7 +1751,6 @@ void HS_DisableAppMonCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_DisableAppMonCmd_Test */ void HS_DisableAppMonCmd_Test_MsgLengthError(void) @@ -1818,7 +1783,6 @@ void HS_DisableAppMonCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_DisableAppMonCmd_Test_MsgLengthError */ void HS_EnableEventMonCmd_Test_Disabled(void) @@ -1862,7 +1826,6 @@ void HS_EnableEventMonCmd_Test_Disabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_EnableEventMonCmd_Test_Disabled */ void HS_EnableEventMonCmd_Test_DisabledMsgLengthError(void) @@ -1895,7 +1858,6 @@ void HS_EnableEventMonCmd_Test_DisabledMsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_EnableEventMonCmd_Test_DisabledMsgLengthError */ void HS_EnableEventMonCmd_Test_AlreadyEnabled(void) @@ -1939,7 +1901,6 @@ void HS_EnableEventMonCmd_Test_AlreadyEnabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_EnableEventMonCmd_Test_AlreadyEnabled */ void HS_EnableEventMonCmd_Test_SubscribeLongError(void) @@ -1986,7 +1947,6 @@ void HS_EnableEventMonCmd_Test_SubscribeLongError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_EnableEventMonCmd_Test_SubscribeLongError */ void HS_EnableEventMonCmd_Test_SubscribeShortError(void) @@ -2033,7 +1993,6 @@ void HS_EnableEventMonCmd_Test_SubscribeShortError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_EnableEventMonCmd_Test_SubscribeShortError */ void HS_DisableEventMonCmd_Test_Enabled(void) @@ -2077,7 +2036,6 @@ void HS_DisableEventMonCmd_Test_Enabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_DisableEventMonCmd_Test_Enabled */ void HS_DisableEventMonCmd_Test_AlreadyDisabled(void) @@ -2121,7 +2079,6 @@ void HS_DisableEventMonCmd_Test_AlreadyDisabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_DisableEventMonCmd_Test_AlreadyDisabled */ void HS_DisableEventMonCmd_Test_UnsubscribeLongError(void) @@ -2168,7 +2125,6 @@ void HS_DisableEventMonCmd_Test_UnsubscribeLongError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_DisableEventMonCmd_Test_UnsubscribeLongError */ void HS_DisableEventMonCmd_Test_UnsubscribeShortError(void) @@ -2215,7 +2171,6 @@ void HS_DisableEventMonCmd_Test_UnsubscribeShortError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_DisableEventMonCmd_Test_UnsubscribeShortError */ void HS_DisableEventMonCmd_Test_MsgLengthError(void) @@ -2248,7 +2203,6 @@ void HS_DisableEventMonCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_DisableEventMonCmd_Test_MsgLengthError */ void HS_EnableAlivenessCmd_Test(void) @@ -2292,7 +2246,6 @@ void HS_EnableAlivenessCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_EnableAlivenessCmd_Test */ void HS_EnableAlivenessCmd_Test_MsgLengthError(void) @@ -2325,7 +2278,6 @@ void HS_EnableAlivenessCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_EnableAlivenessCmd_Test_MsgLengthError */ void HS_DisableAlivenessCmd_Test(void) @@ -2369,7 +2321,6 @@ void HS_DisableAlivenessCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_DisableAlivenessCmd_Test */ void HS_DisableAlivenessCmd_Test_MsgLengthError(void) @@ -2402,7 +2353,6 @@ void HS_DisableAlivenessCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_DisableAlivenessCmd_Test_MsgLengthError */ void HS_EnableCPUHogCmd_Test(void) @@ -2446,7 +2396,6 @@ void HS_EnableCPUHogCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_EnableCPUHogCmd_Test */ void HS_EnableCPUHogCmd_Test_MsgLengthError(void) @@ -2479,7 +2428,6 @@ void HS_EnableCPUHogCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_EnableCPUHogCmd_Test_MsgLengthError */ void HS_DisableCPUHogCmd_Test(void) @@ -2523,7 +2471,6 @@ void HS_DisableCPUHogCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_DisableCPUHogCmd_Test */ void HS_DisableCPUHogCmd_Test_MsgLengthError(void) @@ -2556,7 +2503,6 @@ void HS_DisableCPUHogCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_DisableCPUHogCmd_Test_MsgLengthError */ void HS_ResetResetsPerformedCmd_Test(void) @@ -2596,7 +2542,6 @@ void HS_ResetResetsPerformedCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ResetResetsPerformedCmd_Test */ void HS_ResetResetsPerformedCmd_Test_MsgLengthError(void) @@ -2624,7 +2569,6 @@ void HS_ResetResetsPerformedCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_ResetResetsPerformedCmd_Test_MsgLengthError */ void HS_SetMaxResetsCmd_Test(void) @@ -2666,7 +2610,6 @@ void HS_SetMaxResetsCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SetMaxResetsCmd_Test */ void HS_SetMaxResetsCmd_Test_MsgLengthError(void) @@ -2696,7 +2639,6 @@ void HS_SetMaxResetsCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_SetMaxResetsCmd_Test_MsgLengthError */ #if HS_MAX_EXEC_CNT_SLOTS != 0 @@ -2725,7 +2667,6 @@ void HS_AcquirePointers_Test_Nominal(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_AcquirePointers_Test_Nominal */ #endif @@ -2801,7 +2742,6 @@ void HS_AcquirePointers_Test_ErrorsWithAppMonLoadedAndEventMonLoadedEnabled(void call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 4, "CFE_EVS_SendEvent was called %u time(s), expected 4", call_count_CFE_EVS_SendEvent); - } /* end HS_AcquirePointers_Test_ErrorsWithAppMonLoadedAndEventMonLoadedEnabled */ #endif @@ -2890,7 +2830,6 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled2(v call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 5, "CFE_EVS_SendEvent was called %u time(s), expected 5", call_count_CFE_EVS_SendEvent); - } /* end HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled */ #endif @@ -2979,14 +2918,12 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled(vo call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 5, "CFE_EVS_SendEvent was called %u time(s), expected 5", call_count_CFE_EVS_SendEvent); - } /* end HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabled */ #endif #if HS_MAX_EXEC_CNT_SLOTS != 0 void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabledNoSubscribeError(void) { - HS_AppData.AppMonLoaded = HS_STATE_DISABLED; HS_AppData.EventMonLoaded = HS_STATE_DISABLED; HS_AppData.CurrentAppMonState = HS_STATE_ENABLED; @@ -3025,14 +2962,12 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabledNoS call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 3, "CFE_EVS_SendEvent was called %u time(s), expected 3", call_count_CFE_EVS_SendEvent); - } /* end HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabledNoSubscribeError */ #endif #if HS_MAX_EXEC_CNT_SLOTS != 0 void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabledNoSubscribeError2(void) { - HS_AppData.AppMonLoaded = HS_STATE_DISABLED; HS_AppData.EventMonLoaded = HS_STATE_DISABLED; HS_AppData.CurrentAppMonState = HS_STATE_ENABLED; @@ -3071,14 +3006,12 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabledNoS call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 3, "CFE_EVS_SendEvent was called %u time(s), expected 3", call_count_CFE_EVS_SendEvent); - } /* end HS_AcquirePointers_Test_ErrorsWithCurrentAppMonAndCurrentEventMonEnabledNoSubscribeError */ #endif #if HS_MAX_EXEC_CNT_SLOTS != 0 void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonLoadedDisabledAndCurrentAppMonStateDisabled(void) { - HS_AppData.AppMonLoaded = HS_STATE_DISABLED; HS_AppData.EventMonLoaded = HS_STATE_DISABLED; HS_AppData.CurrentAppMonState = HS_STATE_DISABLED; @@ -3112,7 +3045,6 @@ void HS_AcquirePointers_Test_ErrorsWithCurrentAppMonLoadedDisabledAndCurrentAppM call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_AcquirePointers_Test_ErrorsWithCurrentAppMonLoadedDisabledAndCurrentAppMonStateDisabled */ #endif @@ -3161,7 +3093,6 @@ void HS_AppMonStatusRefresh_Test_CycleCountZero(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_AppMonStatusRefresh_Test_CycleCountZero */ void HS_AppMonStatusRefresh_Test_ActionTypeNOACT(void) @@ -3210,7 +3141,6 @@ void HS_AppMonStatusRefresh_Test_ActionTypeNOACT(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_AppMonStatusRefresh_Test_ActionTypeNOACT */ void HS_AppMonStatusRefresh_Test_ElseCase(void) @@ -3262,7 +3192,6 @@ void HS_AppMonStatusRefresh_Test_ElseCase(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_AppMonStatusRefresh_Test_ElseCase */ void HS_MsgActsStatusRefresh_Test(void) @@ -3291,7 +3220,6 @@ void HS_MsgActsStatusRefresh_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MsgActsStatusRefresh_Test */ /* @@ -3431,7 +3359,6 @@ void UtTest_Setup(void) "HS_AppMonStatusRefresh_Test_ElseCase"); UtTest_Add(HS_MsgActsStatusRefresh_Test, HS_Test_Setup, HS_Test_TearDown, "HS_MsgActsStatusRefresh_Test"); - } /* end UtTest_Setup */ /************************/ diff --git a/unit-test/hs_custom_tests.c b/unit-test/hs_custom_tests.c index 891bbb9..b18e07d 100644 --- a/unit-test/hs_custom_tests.c +++ b/unit-test/hs_custom_tests.c @@ -67,7 +67,6 @@ void HS_IdleTask_Test(void) UtAssert_UINT32_EQ(HS_CustomData.ThisIdleTaskExec, 4); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); - } /* end HS_IdleTask_Test */ void HS_CustomInit_Test_Nominal(void) @@ -101,7 +100,6 @@ void HS_CustomInit_Test_Nominal(void) UtAssert_UINT32_EQ(HS_CustomData.UtilCallsPerMark, HS_UTIL_CALLS_PER_MARK); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); - } /* end HS_CustomInit_Test_Nominal */ void HS_CustomInit_Test_CreateChildTaskError(void) @@ -132,7 +130,6 @@ void HS_CustomInit_Test_CreateChildTaskError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_CustomInit_Test_CreateChildTaskError */ void HS_CustomInit_Test_RegisterSynchCallbackError(void) @@ -175,7 +172,6 @@ void HS_CustomInit_Test_RegisterSynchCallbackError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_CustomInit_Test_RegisterSynchCallbackError */ void HS_CustomCleanup_Test(void) @@ -191,7 +187,6 @@ void HS_CustomCleanup_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_CustomCleanup_Test */ void HS_UtilizationIncrement_Test(void) @@ -207,7 +202,6 @@ void HS_UtilizationIncrement_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_UtilizationIncrement_Test */ void HS_UtilizationMark_Test(void) @@ -234,7 +228,6 @@ void HS_UtilizationMark_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_UtilizationMark_Test */ void HS_MarkIdleCallback_Test(void) @@ -248,7 +241,6 @@ void HS_MarkIdleCallback_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MarkIdleCallback_Test */ void HS_CustomMonitorUtilization_Test(void) @@ -268,7 +260,6 @@ void HS_CustomMonitorUtilization_Test(void) UtAssert_UINT32_EQ(HS_CustomData.UtilCycleCounter, 0); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); - } /* end HS_CustomMonitorUtilization_Test */ void HS_CustomCommands_Test_UtilDiagReport(void) @@ -298,7 +289,6 @@ void HS_CustomCommands_Test_UtilDiagReport(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_CustomCommands_Test_UtilDiagReport */ void HS_CustomCommands_Test_SetUtilParamsCmd(void) @@ -328,7 +318,6 @@ void HS_CustomCommands_Test_SetUtilParamsCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_CustomCommands_Test_SetUtilParamsCmd */ void HS_CustomCommands_Test_SetUtilDiagCmd(void) @@ -358,7 +347,6 @@ void HS_CustomCommands_Test_SetUtilDiagCmd(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_CustomCommands_Test_SetUtilDiagCmd */ void HS_CustomCommands_Test_InvalidCommandCode(void) @@ -384,7 +372,6 @@ void HS_CustomCommands_Test_InvalidCommandCode(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_CustomCommands_Test_InvalidCommandCode */ void HS_UtilDiagReport_Test(void) @@ -421,12 +408,10 @@ void HS_UtilDiagReport_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_UtilDiagReport_Test */ void HS_UtilDiagReport_Test_Loops(void) { - /* ensure all values produce unique time jumps */ HS_CustomData.UtilArray[0] = 0xFFFFFFFE; HS_CustomData.UtilArray[1] = 0x00000111; @@ -457,7 +442,6 @@ void HS_UtilDiagReport_Test_Loops(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_UtilDiagReport_Test_Loops */ void HS_CustomGetUtil_Test(void) @@ -478,7 +462,6 @@ void HS_CustomGetUtil_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_CustomGetUtil_Test */ void HS_CustomGetUtil_Test_DivZero(void) @@ -501,7 +484,6 @@ void HS_CustomGetUtil_Test_DivZero(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_CustomGetUtil_Test_DivZero */ void HS_SetUtilParamsCmd_Test_Nominal(void) @@ -548,7 +530,6 @@ void HS_SetUtilParamsCmd_Test_Nominal(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SetUtilParamsCmd_Test_Nominal */ void HS_SetUtilParamsCmd_Test_NominalMultZero(void) @@ -595,7 +576,6 @@ void HS_SetUtilParamsCmd_Test_NominalMultZero(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SetUtilParamsCmd_Test_NominalMultZero */ void HS_SetUtilParamsCmd_Test_NominalDivZero(void) @@ -642,7 +622,6 @@ void HS_SetUtilParamsCmd_Test_NominalDivZero(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SetUtilParamsCmd_Test_NominalDivZero */ void HS_SetUtilParamsCmd_Test_Error(void) @@ -686,7 +665,6 @@ void HS_SetUtilParamsCmd_Test_Error(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SetUtilParamsCmd_Test_Error */ void HS_SetUtilParamsCmd_Test_MsgLengthError(void) @@ -721,7 +699,6 @@ void HS_SetUtilParamsCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_SetUtilParamsCmd_Test_MsgLengthError */ void HS_SetUtilDiagCmd_Test(void) @@ -764,7 +741,6 @@ void HS_SetUtilDiagCmd_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_SetUtilDiagCmd_Test */ void HS_SetUtilDiagCmd_Test_MsgLengthError(void) @@ -794,7 +770,6 @@ void HS_SetUtilDiagCmd_Test_MsgLengthError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_SetUtilDiagCmd_Test_MsgLengthError */ /* @@ -847,7 +822,6 @@ void UtTest_Setup(void) UtTest_Add(HS_SetUtilDiagCmd_Test, HS_Test_Setup, HS_Test_TearDown, "HS_SetUtilDiagCmd_Test"); UtTest_Add(HS_SetUtilDiagCmd_Test_MsgLengthError, HS_Test_Setup, HS_Test_TearDown, "HS_SetUtilDiagCmd_Test_MsgLengthError"); - } /* end UtTest_Setup */ /************************/ diff --git a/unit-test/hs_monitors_tests.c b/unit-test/hs_monitors_tests.c index 696b77e..eaf2056 100644 --- a/unit-test/hs_monitors_tests.c +++ b/unit-test/hs_monitors_tests.c @@ -92,7 +92,6 @@ void HS_MonitorApplications_Test_AppNameNotFound(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_AppNameNotFound */ void HS_MonitorApplications_Test_AppNameNotFoundDebugEvent(void) @@ -122,7 +121,6 @@ void HS_MonitorApplications_Test_AppNameNotFoundDebugEvent(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_AppNameNotFoundDebugEvent */ void HS_MonitorApplications_Test_GetExeCountFailure(void) @@ -158,7 +156,6 @@ void HS_MonitorApplications_Test_GetExeCountFailure(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_GetExeCountFailure */ void HS_MonitorApplications_Test_ProcessorResetError(void) @@ -219,7 +216,6 @@ void HS_MonitorApplications_Test_ProcessorResetError(void) strCmpResult = strncmp(ExpectedSysLogString, context_CFE_ES_WriteToSysLog.Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); UtAssert_True(strCmpResult == 0, "Sys Log string matched expected result, '%s'", context_CFE_ES_WriteToSysLog.Spec); - } /* end HS_MonitorApplications_Test_ProcessorResetError */ void HS_MonitorApplications_Test_ProcessorResetActionLimitError(void) @@ -280,7 +276,6 @@ void HS_MonitorApplications_Test_ProcessorResetActionLimitError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_ProcessorResetActionLimitError */ void HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoSuccess(void) @@ -342,7 +337,6 @@ void HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoSuccess(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoSuccess */ void HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoNotSuccess(void) @@ -400,7 +394,6 @@ void HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoNotSuccess(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_RestartAppErrorsGetAppInfoNotSuccess */ void HS_MonitorApplications_Test_RestartAppRestartSuccess(void) @@ -438,7 +431,6 @@ void HS_MonitorApplications_Test_RestartAppRestartSuccess(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_RestartAppRestartSuccess */ void HS_MonitorApplications_Test_FailError(void) @@ -486,7 +478,6 @@ void HS_MonitorApplications_Test_FailError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_FailError */ void HS_MonitorApplications_Test_MsgActsNOACT(void) @@ -534,7 +525,6 @@ void HS_MonitorApplications_Test_MsgActsNOACT(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_MsgActsNOACT */ void HS_MonitorApplications_Test_MsgActsNOACTDisabled(void) @@ -582,7 +572,6 @@ void HS_MonitorApplications_Test_MsgActsNOACTDisabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_MsgActsNOACTDisabled */ void HS_MonitorApplications_Test_MsgActsErrorDefault(void) @@ -647,7 +636,6 @@ void HS_MonitorApplications_Test_MsgActsErrorDefault(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_MsgActsErrorDefault */ void HS_MonitorApplications_Test_MsgActsErrorDisabled(void) @@ -699,7 +687,6 @@ void HS_MonitorApplications_Test_MsgActsErrorDisabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_MsgActsErrorDisabled */ void HS_MonitorApplications_Test_MsgActsErrorDefaultCoolDown(void) @@ -751,7 +738,6 @@ void HS_MonitorApplications_Test_MsgActsErrorDefaultCoolDown(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_MsgActsErrorDefaultCoolDown */ void HS_MonitorApplications_Test_MsgActsErrorDefaultDisabled(void) @@ -803,7 +789,6 @@ void HS_MonitorApplications_Test_MsgActsErrorDefaultDisabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_MsgActsErrorDefaultDisabled */ void HS_MonitorApplications_Test_MsgActsErrorDefaultNoEvent(void) @@ -855,7 +840,6 @@ void HS_MonitorApplications_Test_MsgActsErrorDefaultNoEvent(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_Test_MsgActsErrorNoEvent */ void HS_MonitorApplications_CheckInCountdownNotZero(void) @@ -890,7 +874,6 @@ void HS_MonitorApplications_CheckInCountdownNotZero(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorApplications_CheckInCountdownNotZero */ void HS_MonitorEvent_Test_AppName(void) @@ -930,7 +913,6 @@ void HS_MonitorEvent_Test_AppName(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_AppName */ void HS_MonitorEvent_Test_ProcErrorReset(void) @@ -989,7 +971,6 @@ void HS_MonitorEvent_Test_ProcErrorReset(void) UtAssert_True(HS_AppData.ServiceWatchdogFlag == HS_STATE_DISABLED, "HS_AppData.ServiceWatchdogFlag == HS_STATE_DISABLED"); - } /* end HS_MonitorEvent_Test_ProcErrorReset */ void HS_MonitorEvent_Test_ProcErrorNoReset(void) @@ -1048,7 +1029,6 @@ void HS_MonitorEvent_Test_ProcErrorNoReset(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_ProcErrorNoReset */ void HS_MonitorEvent_Test_AppRestartErrors(void) @@ -1108,7 +1088,6 @@ void HS_MonitorEvent_Test_AppRestartErrors(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_AppRestartErrors */ void HS_MonitorEvent_Test_OnlySecondAppRestartError(void) @@ -1158,7 +1137,6 @@ void HS_MonitorEvent_Test_OnlySecondAppRestartError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_OnlySecondAppRestartError */ void HS_MonitorEvent_Test_NoSecondAppRestartError(void) @@ -1208,7 +1186,6 @@ void HS_MonitorEvent_Test_NoSecondAppRestartError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_NoSecondAppRestartError */ void HS_MonitorEvent_Test_DeleteErrors(void) @@ -1268,7 +1245,6 @@ void HS_MonitorEvent_Test_DeleteErrors(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_DeleteErrors */ void HS_MonitorEvent_Test_OnlySecondDeleteError(void) @@ -1318,7 +1294,6 @@ void HS_MonitorEvent_Test_OnlySecondDeleteError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_OnlySecondDeleteError */ void HS_MonitorEvent_Test_NoSecondDeleteError(void) @@ -1368,7 +1343,6 @@ void HS_MonitorEvent_Test_NoSecondDeleteError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_NoSecondDeleteError */ void HS_MonitorEvent_Test_MsgActsError(void) @@ -1426,7 +1400,6 @@ void HS_MonitorEvent_Test_MsgActsError(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_MsgActsError */ void HS_MonitorEvent_Test_MsgActsErrorNoEvent(void) @@ -1470,7 +1443,6 @@ void HS_MonitorEvent_Test_MsgActsErrorNoEvent(void) /* Verify results */ UtAssert_True(HS_AppData.MsgActExec == 1, "HS_AppData.MsgActExec == 1"); UtAssert_True(HS_AppData.MsgActCooldown[0] == 5, "HS_AppData.MsgActCooldown[0] == 5"); - } /* end HS_MonitorEvent_Test_MsgActsErrorNoEvent */ void HS_MonitorEvent_Test_MsgActsDefaultDisabled(void) @@ -1510,7 +1482,6 @@ void HS_MonitorEvent_Test_MsgActsDefaultDisabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_MsgActsDefaultDisabled */ void HS_MonitorEvent_Test_MsgActsDefaultGreaterLastNonMsg(void) @@ -1550,7 +1521,6 @@ void HS_MonitorEvent_Test_MsgActsDefaultGreaterLastNonMsg(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_MsgActsDefaultGreaterLastNonMsg */ void HS_MonitorEvent_Test_MsgActsDefaultLessMaxActTypes(void) @@ -1587,7 +1557,6 @@ void HS_MonitorEvent_Test_MsgActsDefaultLessMaxActTypes(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_MsgActsDefaultLessMaxActTypes */ void HS_MonitorEvent_Test_MsgActsDefaultMaxActTypes(void) @@ -1626,7 +1595,6 @@ void HS_MonitorEvent_Test_MsgActsDefaultMaxActTypes(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_MsgActsDefaultMaxActTypes */ void HS_MonitorEvent_Test_MsgActsCoolDown(void) @@ -1668,7 +1636,6 @@ void HS_MonitorEvent_Test_MsgActsCoolDown(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_MsgActsCoolDown */ void HS_MonitorEvent_Test_MsgActsMATDisabled(void) @@ -1710,7 +1677,6 @@ void HS_MonitorEvent_Test_MsgActsMATDisabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorEvent_Test_MsgActsMATDisabled */ void HS_MonitorUtilization_Test_HighCurrentUtil(void) @@ -1737,7 +1703,6 @@ void HS_MonitorUtilization_Test_HighCurrentUtil(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorUtilization_Test_HighCurrentUtil */ void HS_MonitorUtilization_Test_CurrentUtilLessThanZero(void) @@ -1760,7 +1725,6 @@ void HS_MonitorUtilization_Test_CurrentUtilLessThanZero(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorUtilization_Test_CurrentUtilLessThanZero */ void HS_MonitorUtilization_Test_CPUHogging(void) @@ -1807,12 +1771,10 @@ void HS_MonitorUtilization_Test_CPUHogging(void) UtAssert_True(strCmpResult == 0, "Sys Log string matched expected result, '%s'", context_CFE_ES_WriteToSysLog.Spec); /* For this test case, we don't care about any variables changed after this message */ - } /* end HS_MonitorUtilization_Test_CPUHogging */ void HS_MonitorUtilization_Test_CPUHoggingNotMax(void) { - HS_CustomData.LastIdleTaskInterval = 0; HS_CustomData.UtilMult1 = 1; HS_CustomData.UtilMult2 = 1; @@ -1836,7 +1798,6 @@ void HS_MonitorUtilization_Test_CPUHoggingNotMax(void) call_count_CFE_EVS_SendEvent); /* For this test case, we don't care about any variables changed after this message */ - } /* end HS_MonitorUtilization_Test_CPUHoggingNotMax */ void HS_MonitorUtilization_Test_CurrentCPUHogStateDisabled(void) @@ -1864,7 +1825,6 @@ void HS_MonitorUtilization_Test_CurrentCPUHogStateDisabled(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorUtilization_Test_CurrentCPUHogStateDisabled */ void HS_MonitorUtilization_Test_HighUtilIndex(void) @@ -1894,7 +1854,6 @@ void HS_MonitorUtilization_Test_HighUtilIndex(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorUtilization_Test_HighUtilIndex */ void HS_MonitorUtilization_Test_LowUtilIndex(void) @@ -1924,7 +1883,6 @@ void HS_MonitorUtilization_Test_LowUtilIndex(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_MonitorUtilization_Test_LowUtilIndex */ void HS_ValidateAMTable_Test_UnusedTableEntryCycleCountZero(void) @@ -1966,7 +1924,6 @@ void HS_ValidateAMTable_Test_UnusedTableEntryCycleCountZero(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateAMTable_Test_UnusedTableEntryCycleCountZero */ void HS_ValidateAMTable_Test_UnusedTableEntryActionTypeNOACT(void) @@ -2008,7 +1965,6 @@ void HS_ValidateAMTable_Test_UnusedTableEntryActionTypeNOACT(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateAMTable_Test_UnusedTableEntryActionTypeNOACT */ void HS_ValidateAMTable_Test_BufferNotNull(void) @@ -2062,7 +2018,6 @@ void HS_ValidateAMTable_Test_BufferNotNull(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateAMTable_Test_BufferNotNull */ void HS_ValidateAMTable_Test_ActionTypeNotValid(void) @@ -2116,7 +2071,6 @@ void HS_ValidateAMTable_Test_ActionTypeNotValid(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateAMTable_Test_ActionTypeNotValid */ void HS_ValidateAMTable_Test_EntryGood(void) @@ -2162,7 +2116,6 @@ void HS_ValidateAMTable_Test_EntryGood(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateAMTable_Test_EntryGood */ void HS_ValidateAMTable_Test_Null(void) @@ -2222,7 +2175,6 @@ void HS_ValidateEMTable_Test_UnusedTableEntryEventIDZero(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateEMTable_Test_UnusedTableEntryEventIDZero */ void HS_ValidateEMTable_Test_UnusedTableEntryActionTypeNOACT(void) @@ -2264,7 +2216,6 @@ void HS_ValidateEMTable_Test_UnusedTableEntryActionTypeNOACT(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateEMTable_Test_UnusedTableEntryActionTypeNOACT */ void HS_ValidateEMTable_Test_BufferNotNull(void) @@ -2318,7 +2269,6 @@ void HS_ValidateEMTable_Test_BufferNotNull(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateEMTable_Test_BufferNotNull */ void HS_ValidateEMTable_Test_ActionTypeNotValid(void) @@ -2372,7 +2322,6 @@ void HS_ValidateEMTable_Test_ActionTypeNotValid(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateEMTable_Test_ActionTypeNotValid */ void HS_ValidateEMTable_Test_EntryGood(void) @@ -2418,7 +2367,6 @@ void HS_ValidateEMTable_Test_EntryGood(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateEMTable_Test_EntryGood */ void HS_ValidateEMTable_Test_Null(void) @@ -2488,7 +2436,6 @@ void HS_ValidateXCTable_Test_UnusedTableEntry(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateXCTable_Test_UnusedTableEntry */ #endif @@ -2543,7 +2490,6 @@ void HS_ValidateXCTable_Test_BufferNotNull(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateXCTable_Test_BufferNotNull */ #endif @@ -2604,7 +2550,6 @@ void HS_ValidateXCTable_Test_ResourceTypeNotValid(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateXCTable_Test_ResourceTypeNotValid */ #endif @@ -2647,7 +2592,6 @@ void HS_ValidateXCTable_Test_EntryGood(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateXCTable_Test_EntryGood */ #endif @@ -2729,7 +2673,6 @@ void HS_ValidateMATable_Test_UnusedTableEntry(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateMATable_Test_UnusedTableEntry */ void HS_ValidateMATable_Test_InvalidEnableState(void) @@ -2787,7 +2730,6 @@ void HS_ValidateMATable_Test_InvalidEnableState(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateMATable_Test_InvalidEnableState */ void HS_ValidateMATable_Test_MessageIDTooHigh(void) @@ -2845,7 +2787,6 @@ void HS_ValidateMATable_Test_MessageIDTooHigh(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateMATable_Test_MessageIDTooHigh */ void HS_ValidateMATable_Test_LengthTooHigh(void) @@ -2903,7 +2844,6 @@ void HS_ValidateMATable_Test_LengthTooHigh(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 2, "CFE_EVS_SendEvent was called %u time(s), expected 2", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateMATable_Test_LengthTooHigh */ void HS_ValidateMATable_Test_EntryGood(void) @@ -2951,7 +2891,6 @@ void HS_ValidateMATable_Test_EntryGood(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_ValidateMATable_Test_EntryGood */ void HS_ValidateMATable_Test_Null(void) @@ -3003,7 +2942,6 @@ void HS_SetCDSData_Test(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_SetCDSData_Test */ /* @@ -3138,7 +3076,6 @@ void UtTest_Setup(void) UtTest_Add(HS_ValidateMATable_Test_Null, HS_Test_Setup, HS_Test_TearDown, "HS_ValidateMATable_Test_Null"); UtTest_Add(HS_SetCDSData_Test, HS_Test_Setup, HS_Test_TearDown, "HS_SetCDSData_Test"); - } /* end UtTest_Setup */ /************************/ diff --git a/unit-test/hs_utils_tests.c b/unit-test/hs_utils_tests.c index 26feab2..b262d19 100644 --- a/unit-test/hs_utils_tests.c +++ b/unit-test/hs_utils_tests.c @@ -68,7 +68,6 @@ void HS_VerifyMsgLength_Test_Nominal(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 0, "CFE_EVS_SendEvent was called %u time(s), expected 0", call_count_CFE_EVS_SendEvent); - } /* end HS_VerifyMsgLength_Test_Nominal */ void HS_VerifyMsgLength_Test_LengthErrorHK(void) @@ -110,7 +109,6 @@ void HS_VerifyMsgLength_Test_LengthErrorHK(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_VerifyMsgLength_Test_LengthErrorHK */ void HS_VerifyMsgLength_Test_LengthErrorNonHK(void) @@ -154,7 +152,6 @@ void HS_VerifyMsgLength_Test_LengthErrorNonHK(void) call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", call_count_CFE_EVS_SendEvent); - } /* end HS_VerifyMsgLength_Test_LengthErrorNonHK */ void HS_AMTActionIsValid_Valid(void)