diff --git a/unit-test/sc_app_tests.c b/unit-test/sc_app_tests.c index c6bba1e..04a435e 100644 --- a/unit-test/sc_app_tests.c +++ b/unit-test/sc_app_tests.c @@ -40,77 +40,27 @@ #include "utassert.h" #include "utstubs.h" -/* sc_app_tests globals */ -uint8 call_count_CFE_EVS_SendEvent; - -uint16 SC_APP_TEST_CFE_TBL_RegisterHookCount; - -uint16 SC_APP_TEST_CFE_TBL_GetAddressHookCount; - -uint32 SC_APP_TEST_DummyTableBuffer[10][SC_NUMBER_OF_RTS]; - -SC_AtpControlBlock_t SC_APP_TEST_GlobalAtsCtrlBlck; - -uint32 SC_APP_TEST_GlobalAtsCmdStatusTbl[2048]; - -SC_RtpControlBlock_t SC_APP_TEST_GlobalRtsCtrlBlck; - -SC_RtsInfoEntry_t SC_APP_TEST_GlobalRtsInfoTbl; - /* * Function Definitions */ -CFE_Status_t CFE_TBL_RegisterHook1(void *UserObj, int32 StubRetcode, uint32 CallCount, const UT_StubContext_t *Context) -{ - CFE_TBL_Handle_t *TblHandle = (CFE_TBL_Handle_t *)Context->ArgPtr[0]; - - *TblHandle = (CFE_TBL_Handle_t)SC_APP_TEST_CFE_TBL_RegisterHookCount++; - - return CFE_SUCCESS; -} - -CFE_Status_t CFE_TBL_GetAddressHookNominal(void *UserObj, int32 StubRetcode, uint32 CallCount, - const UT_StubContext_t *Context) -{ - void **TblPtr = (void **)Context->ArgPtr[0]; - - *TblPtr = &SC_APP_TEST_DummyTableBuffer[SC_APP_TEST_CFE_TBL_GetAddressHookCount]; - - SC_OperData.AtsCtrlBlckAddr = &SC_APP_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[1024]; - SC_OperData.RtsCtrlBlckAddr = &SC_APP_TEST_GlobalRtsCtrlBlck; - SC_OperData.RtsInfoTblAddr = &SC_APP_TEST_GlobalRtsInfoTbl; - - if (++SC_APP_TEST_CFE_TBL_GetAddressHookCount > 6) - return CFE_TBL_INFO_UPDATED; - else - return CFE_SUCCESS; -} - -CFE_Status_t CFE_TBL_GetAddressHookNominal2(void *UserObj, int32 StubRetcode, uint32 CallCount, - const UT_StubContext_t *Context) +void UT_Handler_CFE_TBL_GetAddress(void *UserObj, UT_EntryKey_t FuncKey, const UT_StubContext_t *Context) { - return CFE_TBL_ERR_NEVER_LOADED; + /* Set table addresses since they are cleared at initialization */ + SC_Test_SetTableAddrs(); } -int32 CFE_TBL_GetAddressHookError1(void *UserObj, int32 StubRetcode, uint32 CallCount, const UT_StubContext_t *Context) +/* Nominal setup for table initialization */ +void UT_Setup_InitTables(void) { - void **TblPtr = (void **)Context->ArgPtr[0]; - - *TblPtr = &SC_APP_TEST_DummyTableBuffer[SC_APP_TEST_CFE_TBL_GetAddressHookCount]; + uint8 i; - SC_OperData.AtsCtrlBlckAddr = &SC_APP_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[1024]; - SC_OperData.RtsCtrlBlckAddr = &SC_APP_TEST_GlobalRtsCtrlBlck; - SC_OperData.RtsInfoTblAddr = &SC_APP_TEST_GlobalRtsInfoTbl; - - if (++SC_APP_TEST_CFE_TBL_GetAddressHookCount > 6) - return -1; - else - return CFE_SUCCESS; + /* There's 4 info/control tables, and SC_NUMBER_OF_ATS command status tables */ + for (i = 0; i < 4 + SC_NUMBER_OF_ATS; i++) + { + UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_SUCCESS); + } + UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_INFO_UPDATED); } void SC_AppMain_Test_Nominal(void) @@ -129,72 +79,39 @@ void SC_AppMain_Test_Nominal(void) /* Return timeout first time through, will default to success on second */ UT_SetDeferredRetcode(UT_KEY(CFE_SB_ReceiveBuffer), 1, CFE_SB_TIME_OUT); - /* Prevents error messages in call to SC_GetLoadTablePointers */ - SC_APP_TEST_CFE_TBL_GetAddressHookCount = 0; - UT_SetHookFunction(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_GetAddressHookNominal, NULL); + /* Set table addresses */ + UT_SetHandlerFunction(UT_KEY(CFE_TBL_GetAddress), UT_Handler_CFE_TBL_GetAddress, NULL); + UT_Setup_InitTables(); /* Execute the function being tested */ - SC_AppMain(); + UtAssert_VOIDCALL(SC_AppMain()); /* Verify results */ /* Generates 2 event messages we don't care about in this test */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_AppMain_Test_AppInitError(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App terminating, Result = 0x%%08X"); - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "SC App terminating, Result = 0x%%08X\n"); - - /* Prevents error messages in call to SC_GetLoadTablePointers */ - SC_APP_TEST_CFE_TBL_GetAddressHookCount = 0; - UT_SetHookFunction(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_GetAddressHookNominal, NULL); /* Set CFE_EVS_Register to return -1 in order to make SC_AppInit return -1, in order to reach "RunStatus = * CFE_ES_APP_ERROR" */ UT_SetDeferredRetcode(UT_KEY(CFE_EVS_Register), 1, -1); /* Execute the function being tested */ - SC_AppMain(); + UtAssert_VOIDCALL(SC_AppMain()); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APP_EXIT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); + UtAssert_STUB_COUNT(CFE_ES_WriteToSysLog, 2); } void SC_AppMain_Test_RcvMsgError(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "App terminating, Result = 0x%%08X"); - - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "SC App terminating, Result = 0x%%08X\n"); - - /* Prevents error messages in call to SC_GetLoadTablePointers */ - SC_APP_TEST_CFE_TBL_GetAddressHookCount = 0; - UT_SetHookFunction(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_GetAddressHookNominal, NULL); + /* Set table address */ + UT_SetHandlerFunction(UT_KEY(CFE_TBL_GetAddress), UT_Handler_CFE_TBL_GetAddress, NULL); + UT_Setup_InitTables(); /* Set to make loop execute exactly once */ UT_SetDeferredRetcode(UT_KEY(CFE_ES_RunLoop), 1, true); @@ -203,51 +120,25 @@ void SC_AppMain_Test_RcvMsgError(void) UT_SetDeferredRetcode(UT_KEY(CFE_SB_ReceiveBuffer), 1, -1); /* Execute the function being tested */ - SC_AppMain(); + UtAssert_VOIDCALL(SC_AppMain()); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[2].EventID, SC_APP_EXIT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[2].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[2].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[2].Spec); - - /* Generates 3 event messages we don't care about in this test */ - 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); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 3); + UtAssert_STUB_COUNT(CFE_ES_WriteToSysLog, 1); } void SC_AppInit_Test_NominalPowerOnReset(void) { - CFE_Status_t ReturnValue; SC_OperData_t Expected_SC_OperData; SC_AppData_t Expected_SC_AppData; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_HK_TLM_MID); size_t MsgSize = sizeof(SC_HkTlm_t); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "SC Initialized. Version %%d.%%d.%%d.%%d"); /* Set CFE_ES_GetResetType to return CFE_ES_POWERON_RESET in order to reach "SC_AppData.AutoStartRTS = * RTS_ID_AUTO_POWER_ON" */ UT_SetDeferredRetcode(UT_KEY(CFE_ES_GetResetType), 1, CFE_PSP_RST_TYPE_POWERON); - /* Prevents error messages in call to SC_GetLoadTablePointers */ - SC_APP_TEST_CFE_TBL_GetAddressHookCount = 0; - UT_SetHookFunction(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_GetAddressHookNominal, NULL); - - /* Sets table handles */ - SC_APP_TEST_CFE_TBL_RegisterHookCount = 0; - UT_SetHookFunction(UT_KEY(CFE_TBL_Register), CFE_TBL_RegisterHook1, NULL); - /* Set global data structures to non-zero values, to verify that SC_AppInit sets values to 0 (with some exceptions) */ memset(&SC_OperData, 1, sizeof(SC_OperData)); @@ -264,12 +155,14 @@ void SC_AppInit_Test_NominalPowerOnReset(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); + /* Set table address */ + UT_SetHandlerFunction(UT_KEY(CFE_TBL_GetAddress), UT_Handler_CFE_TBL_GetAddress, NULL); + UT_Setup_InitTables(); + /* Execute the function being tested */ - ReturnValue = SC_AppInit(); + UtAssert_INT32_EQ(SC_AppInit(), CFE_SUCCESS); /* Verify results */ - UtAssert_True(ReturnValue == CFE_SUCCESS, "ReturnValue == CFE_SUCCESS"); - Expected_SC_OperData.AtsInfoHandle = 0; Expected_SC_OperData.RtsCtrlBlckHandle = 0; Expected_SC_OperData.AtsCtrlBlckHandle = 0; @@ -296,43 +189,20 @@ void SC_AppInit_Test_NominalPowerOnReset(void) UtAssert_MemCmp(&SC_OperData.HkPacket, &Expected_SC_OperData.HkPacket, sizeof(Expected_SC_OperData.HkPacket), "23"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_INIT_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - /* Generates 1 event messages we don't care about in this test */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_AppInit_Test_Nominal(void) { - CFE_Status_t ReturnValue; SC_OperData_t Expected_SC_OperData; SC_AppData_t Expected_SC_AppData; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_HK_TLM_MID); size_t MsgSize = sizeof(SC_HkTlm_t); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "SC Initialized. Version %%d.%%d.%%d.%%d"); /* Set CFE_ES_GetResetType to return something other than CFE_ES_POWERON_RESET in order to reach * "SC_AppData.AutoStartRTS = RTS_ID_AUTO_PROCESSOR" */ UT_SetDeferredRetcode(UT_KEY(CFE_ES_GetResetType), 1, -1); - /* Prevents error messages in call to SC_GetLoadTablePointers */ - SC_APP_TEST_CFE_TBL_GetAddressHookCount = 0; - UT_SetHookFunction(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_GetAddressHookNominal, NULL); - - /* Sets table handles */ - SC_APP_TEST_CFE_TBL_RegisterHookCount = 0; - UT_SetHookFunction(UT_KEY(CFE_TBL_Register), CFE_TBL_RegisterHook1, NULL); - /* Set global data structures to non-zero values, to verify that SC_AppInit sets values to 0 (with some exceptions) */ memset(&SC_OperData, 1, sizeof(SC_OperData)); @@ -351,12 +221,14 @@ void SC_AppInit_Test_Nominal(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); + /* Set table address */ + UT_SetHandlerFunction(UT_KEY(CFE_TBL_GetAddress), UT_Handler_CFE_TBL_GetAddress, NULL); + UT_Setup_InitTables(); + /* Execute the function being tested */ - ReturnValue = SC_AppInit(); + UtAssert_INT32_EQ(SC_AppInit(), CFE_SUCCESS); /* Verify results */ - UtAssert_True(ReturnValue == CFE_SUCCESS, "ReturnValue == CFE_SUCCESS"); - Expected_SC_OperData.AtsInfoHandle = 0; Expected_SC_OperData.RtsCtrlBlckHandle = 0; Expected_SC_OperData.AtsCtrlBlckHandle = 0; @@ -381,213 +253,97 @@ void SC_AppInit_Test_Nominal(void) UtAssert_MemCmp(&SC_OperData.HkPacket, &Expected_SC_OperData.HkPacket, sizeof(Expected_SC_OperData.HkPacket), "23"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_INIT_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - /* Generates 1 event messages we don't care about in this test */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_AppInit_Test_EVSRegisterError(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Event Services Register returned: 0x%%08X\n"); - /* Set CFE_EVS_Register to return -1 in order to reach "CFE_ES_WriteToSysLog("Event Services Register returned: * 0x%08X\n", Result)" */ UT_SetDeferredRetcode(UT_KEY(CFE_EVS_Register), 1, -1); /* Execute the function being tested */ - ReturnValue = SC_AppInit(); + UtAssert_INT32_EQ(SC_AppInit(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - - 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); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); + UtAssert_STUB_COUNT(CFE_ES_WriteToSysLog, 1); } void SC_AppInit_Test_SBCreatePipeError(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Software Bus Create Pipe returned: 0x%%08X"); - /* Set CFE_SB_CreatePipe to return -1 in order to generate error message SC_INIT_SB_CREATE_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_SB_CreatePipe), 1, -1); /* Execute the function being tested */ - ReturnValue = SC_AppInit(); + UtAssert_INT32_EQ(SC_AppInit(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_INIT_SB_CREATE_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AppInit_Test_SBSubscribeHKError(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Software Bus subscribe to housekeeping returned: 0x%%08X"); - /* Set CFE_SB_Subscribe to return -1 on the first call in order to generate error message * SC_INIT_SB_SUBSCRIBE_HK_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_SB_Subscribe), 1, -1); /* Execute the function being tested */ - ReturnValue = SC_AppInit(); + UtAssert_INT32_EQ(SC_AppInit(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_INIT_SB_SUBSCRIBE_HK_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AppInit_Test_SubscribeTo1HzError(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Software Bus subscribe to 1 Hz cycle returned: 0x%%08X"); - /* Set CFE_SB_Subscribe to return -1 on the 2nd call in order to generate error message * SC_INIT_SB_SUBSCRIBE_1HZ_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_SB_Subscribe), 2, -1); /* Execute the function being tested */ - ReturnValue = SC_AppInit(); + UtAssert_INT32_EQ(SC_AppInit(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_INIT_SB_SUBSCRIBE_1HZ_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AppInit_Test_SBSubscribeToCmdError(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Software Bus subscribe to command returned: 0x%%08X"); - /* Set CFE_SB_Subscribe to return -1 on the 3rd call in order to generate error message * SC_INIT_SB_SUBSCRIBE_CMD_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_SB_Subscribe), 3, -1); /* Execute the function being tested */ - ReturnValue = SC_AppInit(); + UtAssert_INT32_EQ(SC_AppInit(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_INIT_SB_SUBSCRIBE_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AppInit_Test_InitTablesError(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s table register failed, returned: 0x%%08X"); - /* Set CFE_TBL_Register to return -1 in order to reach return statement immediately after * comment "Must be able to create and initialize tables" */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 1, -1); /* Execute the function being tested */ - ReturnValue = SC_AppInit(); + UtAssert_INT32_EQ(SC_AppInit(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_REGISTER_RTS_INFO_TABLE_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_InitTables_Test_Nominal(void) { - /* Prevents error messages in call to SC_GetLoadTablePointers */ - SC_APP_TEST_CFE_TBL_GetAddressHookCount = 0; - UT_SetHookFunction(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_GetAddressHookNominal, NULL); - - /* Sets table handles */ - SC_APP_TEST_CFE_TBL_RegisterHookCount = 0; - UT_SetHookFunction(UT_KEY(CFE_TBL_Register), CFE_TBL_RegisterHook1, NULL); + /* Set table address */ + UT_SetHandlerFunction(UT_KEY(CFE_TBL_GetAddress), UT_Handler_CFE_TBL_GetAddress, NULL); + UT_Setup_InitTables(); /* Execute the function being tested */ UtAssert_INT32_EQ(SC_AppInit(), CFE_SUCCESS); @@ -599,637 +355,295 @@ void SC_InitTables_Test_Nominal(void) void SC_InitTables_Test_ErrorRegisterAllTables(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s table register failed, returned: 0x%%08X"); - /* Set CFE_TBL_Register to return -1 in order to reach return statement immediately after * comment "Must be able to create and initialize tables" */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 1, -1); /* Execute the function being tested */ - ReturnValue = SC_InitTables(); + UtAssert_INT32_EQ(SC_InitTables(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_REGISTER_RTS_INFO_TABLE_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_InitTables_Test_ErrorGetDumpTablePointers(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Table failed Getting Address, returned: 0x%%08X"); - /* Set CFE_TBL_GetAddress to return -1 in order to cause SC_GetDumpTablePointers to return -1, in order to reach * "return(Result)" after SC_GetDumpTablePointers */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, -1); /* Execute the function being tested */ - ReturnValue = SC_InitTables(); + UtAssert_INT32_EQ(SC_InitTables(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_GET_ADDRESS_RTS_INFO_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_InitTables_Test_ErrorGetLoadTablePointers(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS table %%d failed Getting Address, returned: 0x%%08X"); - - /* Prevents error messages in call to SC_GetLoadTablePointers */ - SC_APP_TEST_CFE_TBL_GetAddressHookCount = 0; - UT_SetHookFunction(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_GetAddressHookError1, NULL); - - /* Sets table handles */ - SC_APP_TEST_CFE_TBL_RegisterHookCount = 0; - UT_SetHookFunction(UT_KEY(CFE_TBL_Register), CFE_TBL_RegisterHook1, NULL); - /* Causes SC_GetLoadTablePointers to return -1 in order to cause SC_GetLoadTablePointers to return -1, in order to * reach "Return(Result)" after SC_GetLoadTablePointers */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 7, -1); /* Execute the function being tested */ - ReturnValue = SC_InitTables(); + UtAssert_INT32_EQ(SC_InitTables(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_GET_ADDRESS_ATS_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - /* Generates 1 event message we don't care about in this test */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_RegisterAllTables_Test_Nominal(void) { - CFE_Status_t ReturnValue; - /* Execute the function being tested */ - ReturnValue = SC_RegisterAllTables(); + UtAssert_INT32_EQ(SC_RegisterAllTables(), CFE_SUCCESS); /* Verify results */ - UtAssert_True(ReturnValue == CFE_SUCCESS, "ReturnValue == CFE_SUCCESS"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_RegisterAllTables_Test_ErrorRegisterRTSInformation(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s table register failed, returned: 0x%%08X"); - /* Set CFE_TBL_Register to return -1 on the 1st call in order to generate error message * SC_REGISTER_RTS_INFO_TABLE_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 1, -1); /* Execute the function being tested */ - ReturnValue = SC_RegisterAllTables(); + UtAssert_INT32_EQ(SC_RegisterAllTables(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_REGISTER_RTS_INFO_TABLE_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_RegisterAllTables_Test_ErrorRegisterRTPControl(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s table register failed, returned: 0x%%08X"); - /* Set CFE_TBL_Register to return -1 on the 2nd call in order to generate error message * SC_REGISTER_RTS_CTRL_BLK_TABLE_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 2, -1); /* Execute the function being tested */ - ReturnValue = SC_RegisterAllTables(); + UtAssert_INT32_EQ(SC_RegisterAllTables(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_REGISTER_RTS_CTRL_BLK_TABLE_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_RegisterAllTables_Test_ErrorRegisterATSInformation(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s table register failed, returned: 0x%%08X"); - /* Set CFE_TBL_Register to return -1 on the 3rd call in order to generate error message * SC_REGISTER_ATS_INFO_TABLE_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 3, -1); /* Execute the function being tested */ - ReturnValue = SC_RegisterAllTables(); + UtAssert_INT32_EQ(SC_RegisterAllTables(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_REGISTER_ATS_INFO_TABLE_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_RegisterAllTables_Test_ErrorRegisterATPControl(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "%%s table register failed, returned: 0x%%08X"); - /* Set CFE_TBL_Register to return -1 on the 4th call in order to generate error message * SC_REGISTER_ATS_CTRL_BLK_TABLE_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 4, -1); /* Execute the function being tested */ - ReturnValue = SC_RegisterAllTables(); + UtAssert_INT32_EQ(SC_RegisterAllTables(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_REGISTER_ATS_CTRL_BLK_TABLE_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_RegisterAllTables_Test_ErrorRegisterATSCommandStatus(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS command status table register failed for ATS %%d, returned: 0x%%08X"); - /* Set CFE_TBL_Register to return -1 on the 5th call in order to generate error message * SC_REGISTER_ATS_CMD_STATUS_TABLE_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 5, -1); /* Execute the function being tested */ - ReturnValue = SC_RegisterAllTables(); + UtAssert_INT32_EQ(SC_RegisterAllTables(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_REGISTER_ATS_CMD_STATUS_TABLE_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_RegisterAllTables_Test_ErrorRegisterLoadableRTS(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Table Registration Failed for %%s %%d, returned: 0x%%08X"); - /* Set CFE_TBL_Register to return -1 on the last call when registering loadable RTS tables in order to generate * error message SC_REGISTER_RTS_TBL_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 5 + SC_NUMBER_OF_ATS, -1); /* Execute the function being tested */ - ReturnValue = SC_RegisterAllTables(); + UtAssert_INT32_EQ(SC_RegisterAllTables(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_REGISTER_RTS_TBL_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_RegisterAllTables_Test_ErrorRegisterLoadableATS(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Table Registration Failed for %%s %%d, returned: 0x%%08X"); - /* Set CFE_TBL_Register to return -1 on the last call when registering loadable ATS tables in order to generate * error message SC_REGISTER_ATS_TBL_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 6 + SC_NUMBER_OF_ATS + SC_NUMBER_OF_RTS, -1); /* Execute the function being tested */ - ReturnValue = SC_RegisterAllTables(); + UtAssert_INT32_EQ(SC_RegisterAllTables(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_REGISTER_ATS_TBL_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_RegisterAllTables_Test_ErrorRegisterLoadableAppendATS(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Append ATS Table Registration Failed, returned: 0x%%08X"); - /* Set CFE_TBL_Register to return -1 on the last call when registering loadable Append ATS tables in order to * generate error message SC_REGISTER_APPEND_TBL_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 5 + 2 * SC_NUMBER_OF_ATS + SC_NUMBER_OF_RTS, -1); /* Execute the function being tested */ - ReturnValue = SC_RegisterAllTables(); + UtAssert_INT32_EQ(SC_RegisterAllTables(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_REGISTER_APPEND_TBL_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_RegisterDumpOnlyTables_Test_Nominal(void) { - CFE_Status_t ReturnValue; - /* Execute the function being tested */ - ReturnValue = SC_RegisterDumpOnlyTables(); + UtAssert_INT32_EQ(SC_RegisterDumpOnlyTables(), CFE_SUCCESS); /* Verify results */ - UtAssert_True(ReturnValue == CFE_SUCCESS, "ReturnValue == CFE_SUCCESS"); - UtAssert_STUB_COUNT(CFE_TBL_Register, 6); + UtAssert_STUB_COUNT(CFE_TBL_Register, 4 + SC_NUMBER_OF_ATS); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_RegisterLoadableTables_Test_Nominal(void) { - CFE_Status_t ReturnValue; - /* Execute the function being tested */ - ReturnValue = SC_RegisterLoadableTables(); + UtAssert_INT32_EQ(SC_RegisterLoadableTables(), CFE_SUCCESS); /* Verify results */ - UtAssert_True(ReturnValue == CFE_SUCCESS, "ReturnValue == CFE_SUCCESS"); - UtAssert_STUB_COUNT(CFE_TBL_Register, 67); + UtAssert_STUB_COUNT(CFE_TBL_Register, 1 + SC_NUMBER_OF_RTS + SC_NUMBER_OF_ATS); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetDumpTablePointers_Test_Nominal(void) { - CFE_Status_t ReturnValue; - - /* Same return value as default, but bypasses default hook function to simplify test */ - UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), CFE_SUCCESS); - /* Execute the function being tested */ - ReturnValue = SC_GetDumpTablePointers(); + UtAssert_INT32_EQ(SC_GetDumpTablePointers(), CFE_SUCCESS); /* Verify results */ - UtAssert_True(ReturnValue == CFE_SUCCESS, "ReturnValue == CFE_SUCCESS"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetDumpTablePointers_Test_ErrorGetAddressRTSInformation(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Table failed Getting Address, returned: 0x%%08X"); /* Need to set CFE_TBL_GetAddress to return -1 on 1st call (to generate error message - * SC_GET_ADDRESS_RTS_INFO_ERR_EID) and CFE_SUCCESS on all other calls. This could have been done using just a hook - * function and a global variable, but it was simpler to set a hook function that just returns CFE_SUCCESS and then - * also set a return code for the particular call number. Because of the order of handling of return values and - * hook functions in the stub function, this results in the return code being used if it's the right call number, - * while otherwise using the hook function. */ + * SC_GET_ADDRESS_RTS_INFO_ERR_EID) and CFE_SUCCESS on all other calls. + */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, -1); /* Execute the function being tested */ - ReturnValue = SC_GetDumpTablePointers(); + UtAssert_INT32_EQ(SC_GetDumpTablePointers(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_GET_ADDRESS_RTS_INFO_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetDumpTablePointers_Test_ErrorGetAddressRTPControl(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Table failed Getting Address, returned: 0x%%08X"); - /* Need to set CFE_TBL_GetAddress to return -1 on 2nd call (to generate error message * SC_GET_ADDRESS_RTS_CTRL_BLCK_ERR_EID) */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 2, -1); /* Execute the function being tested */ - ReturnValue = SC_GetDumpTablePointers(); + UtAssert_INT32_EQ(SC_GetDumpTablePointers(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_GET_ADDRESS_RTS_CTRL_BLCK_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetDumpTablePointers_Test_ErrorGetAddressATSInformation(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Table failed Getting Address, returned: 0x%%08X"); - /* Need to set CFE_TBL_GetAddress to return -1 on 3rd call (to generate error message * SC_GET_ADDRESS_ATS_INFO_ERR_EID) */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 3, -1); /* Execute the function being tested */ - ReturnValue = SC_GetDumpTablePointers(); + UtAssert_INT32_EQ(SC_GetDumpTablePointers(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_GET_ADDRESS_ATS_INFO_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetDumpTablePointers_Test_ErrorGetAddressATPControl(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Table failed Getting Address, returned: 0x%%08X"); - /* Need to set CFE_TBL_GetAddress to return -1 on 5th call (to generate error message * SC_GET_ADDRESS_ATS_CTRL_BLCK_ERR_EID) */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 4, -1); /* Execute the function being tested */ - ReturnValue = SC_GetDumpTablePointers(); + UtAssert_INT32_EQ(SC_GetDumpTablePointers(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_GET_ADDRESS_ATS_CTRL_BLCK_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetDumpTablePointers_Test_ErrorGetAddressATSCommandStatus(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS Cmd Status table for ATS %%d failed Getting Address, returned: 0x%%08X"); - /* Need to set CFE_TBL_GetAddress to return -1 on 6th call (to generate error message * SC_GET_ADDRESS_ATS_CMD_STAT_ERR_EID) */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 5, -1); /* Execute the function being tested */ - ReturnValue = SC_GetDumpTablePointers(); + UtAssert_INT32_EQ(SC_GetDumpTablePointers(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_GET_ADDRESS_ATS_CMD_STAT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetLoadTablePointers_Test_Nominal(void) { - CFE_Status_t ReturnValue; - /* Prevents all error messages */ UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_ERR_NEVER_LOADED); /* Execute the function being tested */ - ReturnValue = SC_GetLoadTablePointers(); + UtAssert_INT32_EQ(SC_GetLoadTablePointers(), CFE_SUCCESS); /* Verify results */ - UtAssert_True(ReturnValue == CFE_SUCCESS, "ReturnValue == CFE_SUCCESS"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetLoadTablePointers_Test_ErrorGetAddressLoadableATS(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS table %%d failed Getting Address, returned: 0x%%08X"); - /* Need to set CFE_TBL_GetAddress to return -1 on 1st call (to generate error message SC_GET_ADDRESS_ATS_ERR_EID) */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, -1); /* Execute the function being tested */ - ReturnValue = SC_GetLoadTablePointers(); + UtAssert_INT32_EQ(SC_GetLoadTablePointers(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_GET_ADDRESS_ATS_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetLoadTablePointers_Test_ErrorGetAddressLoadableATSAppend(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Append ATS table failed Getting Address, returned: 0x%%08X"); - /* Need to set CFE_TBL_GetAddress to return -1 on call (SC_NUMBER_OF_ATS + 1) (to generate error message * SC_GET_ADDRESS_APPEND_ERR_EID) */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_TBL_INFO_UPDATED); @@ -1237,33 +651,15 @@ void SC_GetLoadTablePointers_Test_ErrorGetAddressLoadableATSAppend(void) UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, -1); /* Execute the function being tested */ - ReturnValue = SC_GetLoadTablePointers(); + UtAssert_INT32_EQ(SC_GetLoadTablePointers(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_GET_ADDRESS_APPEND_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetLoadTablePointers_Test_ErrorGetAddressLoadableRTS(void) { - CFE_Status_t ReturnValue; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "RTS table %%d failed Getting Address, returned: 0x%%08X"); - /* Need to set CFE_TBL_GetAddress to return -1 on call (SC_NUMBER_OF_ATS + 2) (to generate error message * SC_GET_ADDRESS_RTS_ERR_EID) */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_TBL_INFO_UPDATED); @@ -1272,22 +668,11 @@ void SC_GetLoadTablePointers_Test_ErrorGetAddressLoadableRTS(void) UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, -1); /* Execute the function being tested */ - ReturnValue = SC_GetLoadTablePointers(); + UtAssert_INT32_EQ(SC_GetLoadTablePointers(), -1); /* Verify results */ - UtAssert_True(ReturnValue == -1, "ReturnValue == -1"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_GET_ADDRESS_RTS_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_LoadDefaultTables_Test(void) diff --git a/unit-test/sc_atsrq_tests.c b/unit-test/sc_atsrq_tests.c index bf4a3c9..83017ed 100644 --- a/unit-test/sc_atsrq_tests.c +++ b/unit-test/sc_atsrq_tests.c @@ -40,15 +40,6 @@ #include "utassert.h" #include "utstubs.h" -/* sc_atsrq_tests globals */ -uint8 call_count_CFE_EVS_SendEvent; - -SC_AtsInfoTable_t SC_ATSRQ_TEST_GlobalAtsInfoTable[2]; - -SC_AtpControlBlock_t SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - -uint32 SC_ATSRQ_TEST_GlobalAtsCmdStatus[SC_NUMBER_OF_ATS]; - /* * Function Definitions */ @@ -77,26 +68,17 @@ CFE_TIME_Compare_t UT_SC_StartAtsRq_CompareHook3(void *UserObj, int32 StubRetcod void SC_StartAtsCmd_Test_NominalA(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c Execution Started"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 1; SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE; /* Execute the function being tested */ - SC_StartAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING, @@ -104,41 +86,23 @@ void SC_StartAtsCmd_Test_NominalA(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_STARTATS_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_StartAtsCmd_Test_NominalB(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c Execution Started"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 2; SC_OperData.AtsInfoTblAddr[1].NumberOfCommands = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE; /* Execute the function being tested */ - SC_StartAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING, @@ -146,26 +110,13 @@ void SC_StartAtsCmd_Test_NominalB(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_STARTATS_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_StartAtsCmd_Test_CouldNotStart(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_START_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "All ATS commands were skipped, ATS stopped"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -173,12 +124,6 @@ void SC_StartAtsCmd_Test_CouldNotStart(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - - SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 1; SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE; @@ -187,227 +132,130 @@ void SC_StartAtsCmd_Test_CouldNotStart(void) UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHookAgreaterthanB, NULL); /* Execute the function being tested */ - SC_StartAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_SKP_ALL_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartAtsCmd_Test_NoCommandsA(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_START_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start ATS Rejected: ATS %%c Not Loaded"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 1; SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 0; + SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE; /* Execute the function being tested */ - SC_StartAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTATS_CMD_NOT_LDED_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartAtsCmd_Test_NoCommandsB(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_START_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start ATS Rejected: ATS %%c Not Loaded"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 2; SC_OperData.AtsInfoTblAddr[1].NumberOfCommands = 0; + SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE; /* Execute the function being tested */ - SC_StartAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTATS_CMD_NOT_LDED_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartAtsCmd_Test_InUse(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_START_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start ATS Rejected: ATP is not Idle"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; /* Execute the function being tested */ - SC_StartAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTATS_CMD_NOT_IDLE_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartAtsCmd_Test_InvalidAtsId(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_START_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start ATS %%d Rejected: Invalid ATS ID"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 99; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; /* Execute the function being tested */ - SC_StartAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTATS_CMD_INVLD_ID_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartAtsCmd_Test_InvalidAtsIdZero(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_START_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start ATS %%d Rejected: Invalid ATS ID"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 0; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; /* Execute the function being tested */ - SC_StartAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTATS_CMD_INVLD_ID_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartAtsCmd_Test_InvalidCmdLength(void) @@ -420,139 +268,77 @@ void SC_StartAtsCmd_Test_InvalidCmdLength(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, false); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - /* Execute the function being tested */ - SC_StartAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_StopAtsCmd_Test_NominalA(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_START_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c stopped"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - SC_OperData.AtsCtrlBlckAddr->AtsNumber = SC_ATSA; /* Execute the function being tested */ - SC_StopAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPATS_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopAtsCmd_Test_NominalB(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_START_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c stopped"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - SC_OperData.AtsCtrlBlckAddr->AtsNumber = SC_ATSB; /* Execute the function being tested */ - SC_StopAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPATS_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopAtsCmd_Test_NoRunningAts(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_START_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "There is no ATS running to stop"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - SC_OperData.AtsCtrlBlckAddr->AtsNumber = 99; /* Execute the function being tested */ - SC_StopAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPATS_NO_ATS_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopAtsCmd_Test_InvalidCmdLength(void) @@ -565,45 +351,26 @@ void SC_StopAtsCmd_Test_InvalidCmdLength(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, false); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); - SC_OperData.AtsCtrlBlckAddr->AtsNumber = 99; /* Execute the function being tested */ - SC_StopAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_BeginAts_Test_Nominal(void) { - bool Result; uint16 AtsIndex = 0; uint16 TimeOffset = 0; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS started, skipped %%d commands"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_InitTables(); SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 1; /* Execute the function being tested */ - Result = SC_BeginAts(AtsIndex, TimeOffset); + UtAssert_BOOL_TRUE(SC_BeginAts(AtsIndex, TimeOffset)); /* Verify results */ - UtAssert_True(Result == true, "Result == true"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtsNumber == 1, "SC_OperData.AtsCtrlBlckAddr->AtsNumber == 1"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->CmdNumber == SC_AppData.AtsTimeIndexBuffer[AtsIndex][0], "SC_OperData.AtsCtrlBlckAddr->CmdNumber == SC_AppData.AtsTimeIndexBuffer[AtsIndex][0]"); @@ -611,149 +378,78 @@ void SC_BeginAts_Test_Nominal(void) UtAssert_True(SC_AppData.NextCmdTime[SC_ATP] == 0, "SC_AppData.NextCmdTime[SC_ATP] == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_ERR_SKP_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_BeginAts_Test_AllCommandsSkipped(void) { - bool Result; uint16 AtsIndex = 0; uint16 TimeOffset = 0; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "All ATS commands were skipped, ATS stopped"); UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_AppData.AtsTimeIndexBuffer[0][0] = 1; - - SC_InitTables(); - + SC_AppData.AtsTimeIndexBuffer[0][0] = 1; SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 1; /* Set to cause all commnds to be skipped, to generate error message SC_ATS_SKP_ALL_ERR_EID */ UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHookAgreaterthanB, NULL); /* Execute the function being tested */ - Result = SC_BeginAts(AtsIndex, TimeOffset); + UtAssert_BOOL_FALSE(SC_BeginAts(AtsIndex, TimeOffset)); /* Verify results */ - UtAssert_True(Result == false, "Result == false"); UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_SKIPPED, "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_SKIPPED"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_SKP_ALL_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_BeginAts_Test_InvalidAtsIndex(void) { - bool Result; uint16 AtsIndex = SC_NUMBER_OF_ATS; uint16 TimeOffset = 0; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Begin ATS error: invalid ATS index %%d"); UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_AppData.AtsTimeIndexBuffer[0][0] = 1; - - SC_InitTables(); - + SC_AppData.AtsTimeIndexBuffer[0][0] = 1; SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 1; /* Set to cause all commnds to be skipped, to generate error message SC_ATS_SKP_ALL_ERR_EID */ UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHookAgreaterthanB, NULL); /* Execute the function being tested */ - Result = SC_BeginAts(AtsIndex, TimeOffset); + UtAssert_BOOL_FALSE(SC_BeginAts(AtsIndex, TimeOffset)); /* Verify results */ - UtAssert_True(Result == false, "Result == false"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_BEGINATS_INVLD_INDEX_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_KillAts_Test(void) { - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsInfoTable)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCtrlBlckAddr->AtsNumber = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = 99; /* Execute the function being tested */ - SC_KillAts(); + UtAssert_VOIDCALL(SC_KillAts()); /* Verify results */ UtAssert_True(SC_OperData.AtsInfoTblAddr[0].AtsUseCtr == 1, "SC_OperData.AtsInfoTblAddr[0].AtsUseCtr == 1"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_IDLE, "SC_OperData.AtsCtrlBlckAddr->AtpState == SC_IDLE"); UtAssert_True(SC_AppData.NextCmdTime[SC_ATP] == SC_MAX_TIME, "SC_AppData.NextCmdTime[SC_ATP] == SC_MAX_TIME"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GroundSwitchCmd_Test_Nominal(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Switch ATS is Pending"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCtrlBlckAddr->AtsNumber = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; SC_OperData.AtsInfoTblAddr[1].NumberOfCommands = 1; @@ -761,7 +457,7 @@ void SC_GroundSwitchCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(SC_ToggleAtsIndex), 1, 1); /* Execute the function being tested */ - SC_GroundSwitchCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_GroundSwitchCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == true, @@ -769,41 +465,23 @@ void SC_GroundSwitchCmd_Test_Nominal(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_SWITCH_ATS_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GroundSwitchCmd_Test_DestinationAtsNotLoaded(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Switch ATS Failure: Destination ATS Not Loaded"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCtrlBlckAddr->AtsNumber = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; SC_OperData.AtsInfoTblAddr[1].NumberOfCommands = 0; /* Execute the function being tested */ - SC_GroundSwitchCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_GroundSwitchCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, @@ -811,40 +489,22 @@ void SC_GroundSwitchCmd_Test_DestinationAtsNotLoaded(void) UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_SWITCH_ATS_CMD_NOT_LDED_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GroundSwitchCmd_Test_AtpIdle(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Switch ATS Rejected: ATP is idle"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCtrlBlckAddr->AtsNumber = 1; SC_OperData.AtsCtrlBlckAddr->AtpState = 99; /* Execute the function being tested */ - SC_GroundSwitchCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_GroundSwitchCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, @@ -852,16 +512,7 @@ void SC_GroundSwitchCmd_Test_AtpIdle(void) UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_SWITCH_ATS_CMD_IDLE_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GroundSwitchCmd_Test_InvalidCmdLength(void) @@ -872,35 +523,17 @@ void SC_GroundSwitchCmd_Test_InvalidCmdLength(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, false); - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - /* Execute the function being tested */ SC_GroundSwitchCmd(&UT_CmdBuf.Buf); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ServiceSwitchPend_Test_NominalA(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS Switched from %%c to %%c"); - UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - /* Set to satisfy first if-statement, while not affecting later calls to CFE_TIME_Compare */ UT_SC_StartAtsRq_CompareHookRunCount = 0; UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHook3, NULL); @@ -913,7 +546,7 @@ void SC_ServiceSwitchPend_Test_NominalA(void) UT_SetDeferredRetcode(UT_KEY(SC_ToggleAtsIndex), 1, 1); /* Execute the function being tested */ - SC_ServiceSwitchPend(); + UtAssert_VOIDCALL(SC_ServiceSwitchPend()); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING, @@ -922,32 +555,13 @@ void SC_ServiceSwitchPend_Test_NominalA(void) "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_ATS_SERVICE_SWTCH_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_ServiceSwitchPend_Test_NominalB(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS Switched from %%c to %%c"); - UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - /* Set to satisfy first if-statement, while not affecting later calls to CFE_TIME_Compare */ UT_SC_StartAtsRq_CompareHookRunCount = 0; UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHook3, NULL); @@ -960,7 +574,7 @@ void SC_ServiceSwitchPend_Test_NominalB(void) UT_SetDeferredRetcode(UT_KEY(SC_ToggleAtsIndex), 1, 0); /* Execute the function being tested */ - SC_ServiceSwitchPend(); + UtAssert_VOIDCALL(SC_ServiceSwitchPend()); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING, @@ -969,32 +583,13 @@ void SC_ServiceSwitchPend_Test_NominalB(void) "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_ATS_SERVICE_SWTCH_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_ServiceSwitchPend_Test_AtsEmpty(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Switch ATS Failure: Destination ATS is empty"); - UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - /* Set to satisfy first if-statement, while not affecting later calls to CFE_TIME_Compare */ UT_SC_StartAtsRq_CompareHookRunCount = 0; UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHook3, NULL); @@ -1005,39 +600,20 @@ void SC_ServiceSwitchPend_Test_AtsEmpty(void) SC_OperData.AtsInfoTblAddr[1].NumberOfCommands = 0; /* Execute the function being tested */ - SC_ServiceSwitchPend(); + UtAssert_VOIDCALL(SC_ServiceSwitchPend()); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_SERVICE_SWITCH_ATS_CMD_LDED_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ServiceSwitchPend_Test_AtpIdle(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Switch ATS Rejected: ATP is idle"); - UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - /* Set to satisfy first if-statement, while not affecting later calls to CFE_TIME_Compare */ UT_SC_StartAtsRq_CompareHookRunCount = 0; UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHook3, NULL); @@ -1045,34 +621,20 @@ void SC_ServiceSwitchPend_Test_AtpIdle(void) SC_OperData.AtsCtrlBlckAddr->AtpState = 99; /* Execute the function being tested */ - SC_ServiceSwitchPend(); + UtAssert_VOIDCALL(SC_ServiceSwitchPend()); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_SERVICE_SWITCH_IDLE_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ServiceSwitchPend_Test_NoSwitch(void) { UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, false); - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - /* Set to satisfy first if-statement, while not affecting later calls to CFE_TIME_Compare */ UT_SC_StartAtsRq_CompareHookRunCount = 0; UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHook3, NULL); @@ -1081,31 +643,17 @@ void SC_ServiceSwitchPend_Test_NoSwitch(void) SC_ServiceSwitchPend(); /* Verify results */ - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ServiceSwitchPend_Test_AtsNotStarted(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "All ATS commands were skipped, ATS stopped"); - /* Set to cause SC_BeginAts to return false, in order to reach block starting with "could not start the ats" */ UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHookAgreaterthanB, NULL); UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - /* Set to satisfy first if-statement, while not affecting later calls to CFE_TIME_Compare */ UT_SC_StartAtsRq_CompareHookRunCount = 0; UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHook3, NULL); @@ -1114,11 +662,9 @@ void SC_ServiceSwitchPend_Test_AtsNotStarted(void) SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 1; SC_OperData.AtsInfoTblAddr[1].NumberOfCommands = 1; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; /* Execute the function being tested */ - SC_ServiceSwitchPend(); + UtAssert_VOIDCALL(SC_ServiceSwitchPend()); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_IDLE, "SC_OperData.AtsCtrlBlckAddr->AtpState == SC_IDLE"); @@ -1126,33 +672,11 @@ void SC_ServiceSwitchPend_Test_AtsNotStarted(void) "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_SKP_ALL_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_InlineSwitch_Test_NominalA(void) { - bool Result; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS Switched from %%c to %%c"); - - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - /* Set to satisfy first if-statement, while not affecting later calls to CFE_TIME_Compare */ UT_SC_StartAtsRq_CompareHookRunCount = 0; UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHook3, NULL); @@ -1164,10 +688,9 @@ void SC_InlineSwitch_Test_NominalA(void) UT_SetDeferredRetcode(UT_KEY(SC_ToggleAtsIndex), 1, 1); /* Execute the function being tested */ - Result = SC_InlineSwitch(); + UtAssert_BOOL_TRUE(SC_InlineSwitch()); /* Verify results */ - UtAssert_True(Result == true, "Result == true"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_STARTING, "SC_OperData.AtsCtrlBlckAddr->AtpState == SC_STARTING"); @@ -1176,34 +699,11 @@ void SC_InlineSwitch_Test_NominalA(void) "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_ATS_INLINE_SWTCH_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - /* Generates 1 event message we don't care about in this test */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_InlineSwitch_Test_NominalB(void) { - bool Result; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS Switched from %%c to %%c"); - - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - /* Set to satisfy first if-statement, while not affecting later calls to CFE_TIME_Compare */ UT_SC_StartAtsRq_CompareHookRunCount = 0; UT_SetHookFunction(UT_KEY(CFE_TIME_Compare), UT_SC_StartAtsRq_CompareHook3, NULL); @@ -1215,10 +715,9 @@ void SC_InlineSwitch_Test_NominalB(void) UT_SetDeferredRetcode(UT_KEY(SC_ToggleAtsIndex), 1, 0); /* Execute the function being tested */ - Result = SC_InlineSwitch(); + UtAssert_BOOL_TRUE(SC_InlineSwitch()); /* Verify results */ - UtAssert_True(Result == true, "Result == true"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_STARTING, "SC_OperData.AtsCtrlBlckAddr->AtpState == SC_STARTING"); @@ -1227,30 +726,11 @@ void SC_InlineSwitch_Test_NominalB(void) "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_ATS_INLINE_SWTCH_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - /* Generates 1 event message we don't care about in this test */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_InlineSwitch_Test_AllCommandsSkipped(void) { - bool Result; - - SC_InitTables(); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); /* Set to cause all commnds to be skipped, to reach block starting with comment "all of the commands in the new ats @@ -1262,35 +742,18 @@ void SC_InlineSwitch_Test_AllCommandsSkipped(void) SC_OperData.AtsInfoTblAddr[1].NumberOfCommands = 1; /* Execute the function being tested */ - Result = SC_InlineSwitch(); + UtAssert_BOOL_FALSE(SC_InlineSwitch()); /* Verify results */ - UtAssert_True(Result == false, "Result == false"); UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_InlineSwitch_Test_DestinationAtsNotLoaded(void) { - bool Result; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Switch ATS Failure: Destination ATS Not Loaded"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); - SC_OperData.AtsCtrlBlckAddr->AtsNumber = 1; SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 0; SC_OperData.AtsInfoTblAddr[1].NumberOfCommands = 0; @@ -1299,26 +762,15 @@ void SC_InlineSwitch_Test_DestinationAtsNotLoaded(void) UT_SetDeferredRetcode(UT_KEY(SC_ToggleAtsIndex), 1, 1); /* Execute the function being tested */ - Result = SC_InlineSwitch(); + UtAssert_BOOL_FALSE(SC_InlineSwitch()); /* Verify results */ - UtAssert_True(Result == false, "Result == false"); - UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false, "SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_INLINE_SWTCH_NOT_LDED_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_JumpAtsCmd_Test_SkipOneCmd(void) @@ -1326,20 +778,6 @@ void SC_JumpAtsCmd_Test_SkipOneCmd(void) uint8 AtsIndex = 0; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_JUMP_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Next ATS command time in the ATP was set to %%s"); - - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Jump Cmd: Skipped %%d ATS commands"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_JumpAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1361,7 +799,7 @@ void SC_JumpAtsCmd_Test_SkipOneCmd(void) SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 2; /* Execute the function being tested */ - SC_JumpAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_JumpAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[AtsIndex][0] == SC_SKIPPED, @@ -1375,26 +813,8 @@ void SC_JumpAtsCmd_Test_SkipOneCmd(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_JUMP_ATS_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = - strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[2].EventID, SC_JUMP_ATS_SKIPPED_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[2].EventType, CFE_EVS_EventType_DEBUG); - - strCmpResult = - strncmp(ExpectedEventString[1], context_CFE_EVS_SendEvent[2].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[2].Spec); - - /* Generates 1 event message we don't care about in this test */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 3); } void SC_JumpAtsCmd_Test_AllCommandsSkipped(void) @@ -1402,18 +822,6 @@ void SC_JumpAtsCmd_Test_AllCommandsSkipped(void) uint8 AtsIndex = 0; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_JUMP_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Jump Cmd: All ATS commands were skipped, ATS stopped"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_JumpAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1431,39 +839,19 @@ void SC_JumpAtsCmd_Test_AllCommandsSkipped(void) SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 1; /* Execute the function being tested */ - SC_JumpAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_JumpAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_JUMPATS_CMD_STOPPED_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_JumpAtsCmd_Test_NoRunningAts(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_JUMP_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS Jump Failed: No active ATS"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_JumpAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1473,22 +861,13 @@ void SC_JumpAtsCmd_Test_NoRunningAts(void) SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE; /* Execute the function being tested */ - SC_JumpAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_JumpAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_JUMPATS_CMD_NOT_ACT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_JumpAtsCmd_Test_AtsNotLoaded(void) @@ -1496,18 +875,6 @@ void SC_JumpAtsCmd_Test_AtsNotLoaded(void) uint8 AtsIndex = 0; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_JUMP_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Next ATS command time in the ATP was set to %%s"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_JumpAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1526,7 +893,7 @@ void SC_JumpAtsCmd_Test_AtsNotLoaded(void) SC_OperData.AtsInfoTblAddr[0].NumberOfCommands = 2; /* Execute the function being tested */ - SC_JumpAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_JumpAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[AtsIndex][0] == SC_SKIPPED, @@ -1540,16 +907,7 @@ void SC_JumpAtsCmd_Test_AtsNotLoaded(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_JUMP_ATS_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_JumpAtsCmd_Test_InvalidCmdLength(void) @@ -1557,13 +915,6 @@ void SC_JumpAtsCmd_Test_InvalidCmdLength(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_JUMP_ATS_CC; - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_JumpAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1572,30 +923,16 @@ void SC_JumpAtsCmd_Test_InvalidCmdLength(void) SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE; /* Execute the function being tested */ - SC_JumpAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_JumpAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void ContinueAtsOnFailureCmd_Test_Nominal(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_CONTINUE_ATS_ON_FAILURE_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Continue-ATS-On-Failure command, State: %%d"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_SetContinueAtsOnFailureCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1605,7 +942,7 @@ void ContinueAtsOnFailureCmd_Test_Nominal(void) UT_CmdBuf.SetContinueAtsOnFailureCmd.ContinueState = true; /* Execute the function being tested */ - SC_ContinueAtsOnFailureCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ContinueAtsOnFailureCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.ContinueAtsOnFailureFlag == true, @@ -1613,33 +950,13 @@ void ContinueAtsOnFailureCmd_Test_Nominal(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_CONT_CMD_DEB_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void ContinueAtsOnFailureCmd_Test_FalseState(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_CONTINUE_ATS_ON_FAILURE_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Continue-ATS-On-Failure command, State: %%d"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_SetContinueAtsOnFailureCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1649,7 +966,7 @@ void ContinueAtsOnFailureCmd_Test_FalseState(void) UT_CmdBuf.SetContinueAtsOnFailureCmd.ContinueState = false; /* Execute the function being tested */ - SC_ContinueAtsOnFailureCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ContinueAtsOnFailureCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.ContinueAtsOnFailureFlag == false, @@ -1657,34 +974,13 @@ void ContinueAtsOnFailureCmd_Test_FalseState(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_CONT_CMD_DEB_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void ContinueAtsOnFailureCmd_Test_InvalidState(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_CONTINUE_ATS_ON_FAILURE_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Continue ATS On Failure command failed, invalid state: %%d"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_SetContinueAtsOnFailureCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1694,22 +990,13 @@ void ContinueAtsOnFailureCmd_Test_InvalidState(void) UT_CmdBuf.SetContinueAtsOnFailureCmd.ContinueState = 99; /* Execute the function being tested */ - SC_ContinueAtsOnFailureCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ContinueAtsOnFailureCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_CONT_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void ContinueAtsOnFailureCmd_Test_InvalidCmdLength(void) @@ -1717,96 +1004,52 @@ void ContinueAtsOnFailureCmd_Test_InvalidCmdLength(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_CONTINUE_ATS_ON_FAILURE_CC; - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_SetContinueAtsOnFailureCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, false); /* Execute the function being tested */ - SC_ContinueAtsOnFailureCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ContinueAtsOnFailureCmd(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_AppendAtsCmd_Test_Nominal(void) { SC_AtsEntryHeader_t *Entry; - uint8 AtsIndex = 0; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; + uint8 AtsIndex = 0; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_APPEND_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Append ATS %%c command: %%d ATS entries appended"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_AppendAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; - Entry->CmdNumber = 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; + Entry->CmdNumber = 1; UT_CmdBuf.AppendAtsCmd.AtsId = 1; SC_OperData.AtsInfoTblAddr[AtsIndex].NumberOfCommands = 1; SC_OperData.HkPacket.AppendEntryCount = 1; /* Execute the function being tested */ - SC_AppendAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_AppendAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AppendCmdArg == 1, "SC_OperData.HkPacket.AppendCmdArg == 1"); UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AppendAtsCmd_Test_InvalidAtsId(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_APPEND_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Append ATS error: invalid ATS ID = %%d"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_AppendAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1817,39 +1060,19 @@ void SC_AppendAtsCmd_Test_InvalidAtsId(void) SC_OperData.HkPacket.AppendEntryCount = 1; /* Execute the function being tested */ - SC_AppendAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_AppendAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_ARG_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AppendAtsCmd_Test_InvalidAtsIdZero(void) { CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_APPEND_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Append ATS error: invalid ATS ID = %%d"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_AppendAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1860,22 +1083,13 @@ void SC_AppendAtsCmd_Test_InvalidAtsIdZero(void) SC_OperData.HkPacket.AppendEntryCount = 1; /* Execute the function being tested */ - SC_AppendAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_AppendAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_ARG_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AppendAtsCmd_Test_AtsTableEmpty(void) @@ -1883,17 +1097,6 @@ void SC_AppendAtsCmd_Test_AtsTableEmpty(void) uint8 AtsIndex = 0; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_APPEND_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Append ATS %%c error: ATS table is empty"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_AppendAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1905,22 +1108,13 @@ void SC_AppendAtsCmd_Test_AtsTableEmpty(void) SC_OperData.AtsInfoTblAddr[AtsIndex].NumberOfCommands = 0; /* Execute the function being tested */ - SC_AppendAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_AppendAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_TGT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AppendAtsCmd_Test_AppendTableEmpty(void) @@ -1928,17 +1122,6 @@ void SC_AppendAtsCmd_Test_AppendTableEmpty(void) uint8 AtsIndex = 0; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_APPEND_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Append ATS %%c error: Append table is empty"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_AppendAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1950,22 +1133,13 @@ void SC_AppendAtsCmd_Test_AppendTableEmpty(void) SC_OperData.AtsInfoTblAddr[AtsIndex].NumberOfCommands = 1; /* Execute the function being tested */ - SC_AppendAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_AppendAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_SRC_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AppendAtsCmd_Test_NoRoomForAppendInAts(void) @@ -1973,18 +1147,6 @@ void SC_AppendAtsCmd_Test_NoRoomForAppendInAts(void) uint8 AtsIndex = 0; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_APPEND_ATS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Append ATS %%c error: ATS size = %%d, Append size = %%d, ATS buffer = %%d"); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_AppendAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1998,22 +1160,13 @@ void SC_AppendAtsCmd_Test_NoRoomForAppendInAts(void) SC_AppData.AppendWordCount = SC_ATS_BUFF_SIZE; /* Execute the function being tested */ - SC_AppendAtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_AppendAtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_APPEND_CMD_FIT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AppendAtsCmd_Test_InvalidCmdLength(void) @@ -2021,13 +1174,6 @@ void SC_AppendAtsCmd_Test_InvalidCmdLength(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_APPEND_ATS_CC; - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_InitTables(); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_AppendAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -2037,10 +1183,7 @@ void SC_AppendAtsCmd_Test_InvalidCmdLength(void) SC_AppendAtsCmd(&UT_CmdBuf.Buf); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void UtTest_Setup(void) diff --git a/unit-test/sc_cmds_tests.c b/unit-test/sc_cmds_tests.c index f79438d..d9a84ef 100644 --- a/unit-test/sc_cmds_tests.c +++ b/unit-test/sc_cmds_tests.c @@ -39,7 +39,6 @@ #include "utstubs.h" /* sc_cmds_tests globals */ -uint8 call_count_CFE_EVS_SendEvent; /* * Function Definitions @@ -63,22 +62,10 @@ int32 Ut_SC_UpdateNextTimeHook(void *UserObj, int32 StubRetcode, uint32 CallCoun void SC_ProcessAtpCmd_Test_SwitchCmd(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_SWITCH_ATS_CC; bool ChecksumValid; - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -107,7 +94,7 @@ void SC_ProcessAtpCmd_Test_SwitchCmd(void) UT_SetDeferredRetcode(UT_KEY(SC_InlineSwitch), 1, true); /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 1, "SC_OperData.HkPacket.AtsCmdCtr == 1"); @@ -116,31 +103,16 @@ void SC_ProcessAtpCmd_Test_SwitchCmd(void) UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED, "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessAtpCmd_Test_NonSwitchCmd(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_NOOP_CC; bool ChecksumValid; - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -169,7 +141,7 @@ void SC_ProcessAtpCmd_Test_NonSwitchCmd(void) UT_SetDeferredRetcode(UT_KEY(SC_InlineSwitch), 1, true); /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 1, "SC_OperData.HkPacket.AtsCmdCtr == 1"); @@ -178,31 +150,16 @@ void SC_ProcessAtpCmd_Test_NonSwitchCmd(void) UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED, "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessAtpCmd_Test_InlineSwitchError(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_SWITCH_ATS_CC; bool ChecksumValid; - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -231,7 +188,7 @@ void SC_ProcessAtpCmd_Test_InlineSwitchError(void) UT_SetDeferredRetcode(UT_KEY(SC_InlineSwitch), 1, false); /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); @@ -242,37 +199,15 @@ void SC_ProcessAtpCmd_Test_InlineSwitchError(void) UtAssert_True(SC_OperData.HkPacket.LastAtsErrSeq == 1, "SC_OperData.HkPacket.LastAtsErrSeq == 1"); UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessAtpCmd_Test_SBErrorAtsA(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_NOOP_CC; bool ChecksumValid; - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS Command Distribution Failed, Cmd Number: %%d, SB returned: 0x%%08X"); - - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c Aborted"); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -301,7 +236,7 @@ void SC_ProcessAtpCmd_Test_SBErrorAtsA(void) UT_SetDeferredRetcode(UT_KEY(CFE_SB_TransmitMsg), 1, -1); /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); @@ -313,52 +248,16 @@ void SC_ProcessAtpCmd_Test_SBErrorAtsA(void) UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_DIST_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_ATS_ABT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[1], context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_ProcessAtpCmd_Test_SBErrorAtsB(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_NOOP_CC; bool ChecksumValid; - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS Command Distribution Failed, Cmd Number: %%d, SB returned: 0x%%08X"); - - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c Aborted"); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[1] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[1][0]; Entry->CmdNumber = 1; @@ -387,7 +286,7 @@ void SC_ProcessAtpCmd_Test_SBErrorAtsB(void) UT_SetDeferredRetcode(UT_KEY(CFE_SB_TransmitMsg), 1, -1); /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); @@ -399,54 +298,16 @@ void SC_ProcessAtpCmd_Test_SBErrorAtsB(void) UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_DIST_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_ATS_ABT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[1], context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_ProcessAtpCmd_Test_ChecksumFailedAtsA(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_SWITCH_ATS_CC; bool ChecksumValid; - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS Command Failed Checksum: Command #%%d Skipped"); - - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c Aborted"); - - memset(&AtsCmdStatusTbl, 0, sizeof(AtsCmdStatusTbl)); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -476,7 +337,7 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsA(void) UT_SetDeferredRetcode(UT_KEY(SC_InlineSwitch), 1, true); /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); @@ -487,52 +348,16 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsA(void) "SC_OperData.AtsCmdStatusTblAddr[1][0] == SC_FAILED_CHECKSUM"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_CHKSUM_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_ATS_ABT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[1], context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_ProcessAtpCmd_Test_ChecksumFailedAtsB(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_SWITCH_ATS_CC; bool ChecksumValid; - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS Command Failed Checksum: Command #%%d Skipped"); - - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c Aborted"); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[1] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[1][0]; Entry->CmdNumber = 1; @@ -562,7 +387,7 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsB(void) UT_SetDeferredRetcode(UT_KEY(SC_InlineSwitch), 1, true); /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); @@ -573,52 +398,16 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsB(void) "SC_OperData.AtsCmdStatusTblAddr[1][0] == SC_FAILED_CHECKSUM"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_CHKSUM_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_ATS_ABT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[1], context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_ProcessAtpCmd_Test_ChecksumFailedAtsAContinue(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_SWITCH_ATS_CC; bool ChecksumValid; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS Command Failed Checksum: Command #%%d Skipped"); - - memset(&AtsCmdStatusTbl, 0, sizeof(AtsCmdStatusTbl)); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -648,7 +437,7 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsAContinue(void) UT_SetDeferredRetcode(UT_KEY(SC_InlineSwitch), 1, true); /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); @@ -659,40 +448,12 @@ void SC_ProcessAtpCmd_Test_ChecksumFailedAtsAContinue(void) "SC_OperData.AtsCmdStatusTblAddr[1][0] == SC_FAILED_CHECKSUM"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_CHKSUM_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessAtpCmd_Test_CmdNumberMismatchAtsA(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS Command Number Mismatch: Command Skipped, expected: %%d received: %%d"); - - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c Aborted"); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 3; @@ -709,7 +470,7 @@ void SC_ProcessAtpCmd_Test_CmdNumberMismatchAtsA(void) SC_AppData.AtsCmdIndexBuffer[0][0] = 0; /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); @@ -720,49 +481,13 @@ void SC_ProcessAtpCmd_Test_CmdNumberMismatchAtsA(void) "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_SKIPPED"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_MSMTCH_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_ATS_ABT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[1], context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_ProcessAtpCmd_Test_CmdNumberMismatchAtsB(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS Command Number Mismatch: Command Skipped, expected: %%d received: %%d"); - - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c Aborted"); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[1] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[1][0]; Entry->CmdNumber = 3; @@ -779,7 +504,7 @@ void SC_ProcessAtpCmd_Test_CmdNumberMismatchAtsB(void) SC_AppData.AtsCmdIndexBuffer[1][0] = 0; /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); @@ -790,49 +515,13 @@ void SC_ProcessAtpCmd_Test_CmdNumberMismatchAtsB(void) "SC_OperData.AtsCmdStatusTblAddr[1][0] == SC_SKIPPED"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_MSMTCH_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_ATS_ABT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[1], context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_ProcessAtpCmd_Test_CmdNotLoaded(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - memset(AtsCmdStatusTbl, 0, sizeof(AtsCmdStatusTbl)); - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid ATS Command Status: Command Skipped, Status: %%d"); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -848,7 +537,7 @@ void SC_ProcessAtpCmd_Test_CmdNotLoaded(void) SC_AppData.AtsCmdIndexBuffer[0][0] = 0; /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); @@ -857,33 +546,12 @@ void SC_ProcessAtpCmd_Test_CmdNotLoaded(void) UtAssert_True(SC_OperData.HkPacket.LastAtsErrCmd == 1, "SC_OperData.HkPacket.LastAtsErrCmd == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_SKP_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessAtpCmd_Test_CompareAbsTime(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; - - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -901,32 +569,17 @@ void SC_ProcessAtpCmd_Test_CompareAbsTime(void) UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessAtpCmd_Test_NextProcNumber(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; - - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -942,32 +595,17 @@ void SC_ProcessAtpCmd_Test_NextProcNumber(void) SC_AppData.AtsCmdIndexBuffer[0][0] = 0; /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessAtpCmd_Test_AtpState(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; - - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -983,36 +621,21 @@ void SC_ProcessAtpCmd_Test_AtpState(void) SC_AppData.AtsCmdIndexBuffer[0][0] = 0; /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 0, "SC_OperData.HkPacket.AtsCmdCtr == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessAtpCmd_Test_CmdMid(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl; CFE_SB_MsgId_t TestMsgId = CFE_SB_INVALID_MSG_ID; CFE_MSG_FcnCode_t FcnCode = SC_SWITCH_ATS_CC; bool ChecksumValid; - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -1041,7 +664,7 @@ void SC_ProcessAtpCmd_Test_CmdMid(void) UT_SetDeferredRetcode(UT_KEY(SC_InlineSwitch), 1, true); /* Execute the function being tested */ - SC_ProcessAtpCmd(); + UtAssert_VOIDCALL(SC_ProcessAtpCmd()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AtsCmdCtr == 1, "SC_OperData.HkPacket.AtsCmdCtr == 1"); @@ -1049,24 +672,12 @@ void SC_ProcessAtpCmd_Test_CmdMid(void) UtAssert_True(SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED, "SC_OperData.AtsCmdStatusTblAddr[0][0] == SC_EXECUTED"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRtpCommand_Test_Nominal(void) { - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - bool ChecksumValid; - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + bool ChecksumValid; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; @@ -1079,7 +690,7 @@ void SC_ProcessRtpCommand_Test_Nominal(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_ValidateChecksum), &ChecksumValid, sizeof(ChecksumValid), false); /* Execute the function being tested */ - SC_ProcessRtpCommand(); + UtAssert_VOIDCALL(SC_ProcessRtpCommand()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.RtsCmdCtr == 1, "SC_OperData.HkPacket.RtsCmdCtr == 1"); @@ -1088,29 +699,12 @@ void SC_ProcessRtpCommand_Test_Nominal(void) UtAssert_True(SC_OperData.RtsInfoTblAddr[0].CmdCtr == 1, "SC_OperData.RtsInfoTblAddr[0].CmdCtr == 1"); UtAssert_True(SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 0, "SC_OperData.RtsInfoTblAddr[0].CmdErrCtr == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRtpCommand_Test_BadSoftwareBusReturn(void) { - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - bool ChecksumValid; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "RTS %%03d Command Distribution Failed: RTS Stopped. SB returned 0x%%08X"); - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + bool ChecksumValid; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; @@ -1126,7 +720,7 @@ void SC_ProcessRtpCommand_Test_BadSoftwareBusReturn(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_ValidateChecksum), &ChecksumValid, sizeof(ChecksumValid), false); /* Execute the function being tested */ - SC_ProcessRtpCommand(); + UtAssert_VOIDCALL(SC_ProcessRtpCommand()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.RtsCmdCtr == 0, "SC_OperData.HkPacket.RtsCmdCtr == 0"); @@ -1138,34 +732,12 @@ void SC_ProcessRtpCommand_Test_BadSoftwareBusReturn(void) UtAssert_True(SC_OperData.HkPacket.LastRtsErrCmd == 0, "SC_OperData.HkPacket.LastRtsErrCmd == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_DIST_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessRtpCommand_Test_BadChecksum(void) { - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - bool ChecksumValid; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS %%03d Command Failed Checksum: RTS Stopped"); - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + bool ChecksumValid; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; @@ -1178,7 +750,7 @@ void SC_ProcessRtpCommand_Test_BadChecksum(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_ValidateChecksum), &ChecksumValid, sizeof(ChecksumValid), false); /* Execute the function being tested */ - SC_ProcessRtpCommand(); + UtAssert_VOIDCALL(SC_ProcessRtpCommand()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.RtsCmdCtr == 0, "SC_OperData.HkPacket.RtsCmdCtr == 0"); @@ -1190,30 +762,11 @@ void SC_ProcessRtpCommand_Test_BadChecksum(void) UtAssert_True(SC_OperData.HkPacket.LastRtsErrCmd == 0, "SC_OperData.HkPacket.LastRtsErrCmd == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_CHKSUM_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessRtpCommand_Test_NextCmdTime(void) { - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; - SC_AppData.NextCmdTime[SC_RTP] = 1; SC_AppData.CurrentTime = 0; SC_AppData.NextProcNumber = SC_RTP; @@ -1221,27 +774,14 @@ void SC_ProcessRtpCommand_Test_NextCmdTime(void) SC_OperData.RtsInfoTblAddr[SC_OperData.RtsCtrlBlckAddr->RtsNumber - 1].RtsStatus = SC_EXECUTING; /* Execute the function being tested */ - SC_ProcessRtpCommand(); + UtAssert_VOIDCALL(SC_ProcessRtpCommand()); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRtpCommand_Test_ProcNumber(void) { - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; - SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; SC_AppData.NextProcNumber = SC_NONE; @@ -1249,54 +789,28 @@ void SC_ProcessRtpCommand_Test_ProcNumber(void) SC_OperData.RtsInfoTblAddr[SC_OperData.RtsCtrlBlckAddr->RtsNumber - 1].RtsStatus = SC_EXECUTING; /* Execute the function being tested */ - SC_ProcessRtpCommand(); + UtAssert_VOIDCALL(SC_ProcessRtpCommand()); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRtpCommand_Test_RtsNumberZero(void) { - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; - SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; SC_AppData.NextProcNumber = SC_RTP; SC_OperData.RtsCtrlBlckAddr->RtsNumber = 0; /* RtsNumber > 0 will be false so nothing should happen, branch coverage */ - SC_ProcessRtpCommand(); + UtAssert_VOIDCALL(SC_ProcessRtpCommand()); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRtpCommand_Test_RtsNumberHigh(void) { - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; - SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; SC_AppData.NextProcNumber = SC_RTP; @@ -1304,27 +818,14 @@ void SC_ProcessRtpCommand_Test_RtsNumberHigh(void) SC_OperData.RtsInfoTblAddr[SC_OperData.RtsCtrlBlckAddr->RtsNumber - 1].RtsStatus = SC_EXECUTING; /* Execute the function being tested */ - SC_ProcessRtpCommand(); + UtAssert_VOIDCALL(SC_ProcessRtpCommand()); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRtpCommand_Test_RtsStatus(void) { - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; - SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; SC_AppData.NextProcNumber = SC_RTP; @@ -1332,41 +833,16 @@ void SC_ProcessRtpCommand_Test_RtsStatus(void) SC_OperData.RtsInfoTblAddr[SC_OperData.RtsCtrlBlckAddr->RtsNumber - 1].RtsStatus = SC_EMPTY; /* Execute the function being tested */ - SC_ProcessRtpCommand(); + UtAssert_VOIDCALL(SC_ProcessRtpCommand()); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_SendHkPacket_Test(void) { - uint8 i; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl[SC_NUMBER_OF_ATS]; - SC_RtpControlBlock_t RtsCtrlBlck; - int32 LastRtsHkIndex = 0; - - memset(&AtsCmdStatusTbl, 0, sizeof(AtsCmdStatusTbl)); - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl[0]; - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; - - SC_InitTables(); + uint8 i; + int32 LastRtsHkIndex = 0; SC_OperData.HkPacket.CmdErrCtr = 1; SC_OperData.HkPacket.CmdCtr = 2; @@ -1409,7 +885,7 @@ void SC_SendHkPacket_Test(void) sizeof(SC_OperData.HkPacket.RtsExecutingStatus) / sizeof(SC_OperData.HkPacket.RtsExecutingStatus[0]) - 1; /* Execute the function being tested */ - SC_SendHkPacket(); + UtAssert_VOIDCALL(SC_SendHkPacket()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); @@ -1462,10 +938,7 @@ void SC_SendHkPacket_Test(void) UtAssert_INT32_EQ(SC_OperData.HkPacket.RtsExecutingStatus[LastRtsHkIndex], 32767); UtAssert_INT32_EQ(SC_OperData.HkPacket.RtsDisabledStatus[LastRtsHkIndex], 32767); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRequest_Test_CmdMID(void) @@ -1476,10 +949,6 @@ void SC_ProcessRequest_Test_CmdMID(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_NOOP_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "No-op command. Version %%d.%%d.%%d.%%d"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); @@ -1488,23 +957,14 @@ void SC_ProcessRequest_Test_CmdMID(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_ProcessRequest(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessRequest(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 0, "SC_OperData.HkPacket.CmdErrCtr == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_NOOP_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessRequest_Test_HkMID(void) @@ -1513,37 +973,17 @@ void SC_ProcessRequest_Test_HkMID(void) ** Test case: SC_SEND_HK_MID **/ - CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_SEND_HK_MID); - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl[SC_NUMBER_OF_ATS]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl[0]; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; - - SC_InitTables(); + CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_SEND_HK_MID); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_ProcessRequest(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessRequest(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRequest_Test_HkMIDNoVerifyCmdLength(void) @@ -1552,35 +992,15 @@ void SC_ProcessRequest_Test_HkMIDNoVerifyCmdLength(void) ** Test case: SC_SEND_HK_MID **/ - CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_SEND_HK_MID); - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl[SC_NUMBER_OF_ATS]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl[0]; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; - - SC_InitTables(); + CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_SEND_HK_MID); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); /* Execute the function being tested */ - SC_ProcessRequest(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessRequest(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRequest_Test_HkMIDAutoStartRts(void) @@ -1589,42 +1009,22 @@ void SC_ProcessRequest_Test_HkMIDAutoStartRts(void) ** Test case: SC_SEND_HK_MID **/ - CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_SEND_HK_MID); - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl[SC_NUMBER_OF_ATS]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl[0]; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_SEND_HK_MID); SC_AppData.AutoStartRTS = 1; - SC_InitTables(); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_ProcessRequest(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessRequest(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_AppData.AutoStartRTS == 0, "SC_AppData.AutoStartRTS == 0"); UtAssert_BOOL_FALSE(SC_OperData.RtsInfoTblAddr[SC_AppData.AutoStartRTS].DisabledFlag); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRequest_Test_HkMIDAutoStartRtsLoaded(void) @@ -1633,43 +1033,23 @@ void SC_ProcessRequest_Test_HkMIDAutoStartRtsLoaded(void) ** Test case: SC_SEND_HK_MID **/ - CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_SEND_HK_MID); - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl[SC_NUMBER_OF_ATS]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl[0]; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_SEND_HK_MID); SC_AppData.AutoStartRTS = 1; SC_OperData.RtsInfoTblAddr[SC_AppData.AutoStartRTS - 1].RtsStatus = SC_LOADED; - SC_InitTables(); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_ProcessRequest(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessRequest(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_AppData.AutoStartRTS == 0, "SC_AppData.AutoStartRTS == 0"); UtAssert_BOOL_FALSE(SC_OperData.RtsInfoTblAddr[SC_AppData.AutoStartRTS].DisabledFlag); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRequest_Test_1HzWakeupNONE(void) @@ -1677,45 +1057,25 @@ void SC_ProcessRequest_Test_1HzWakeupNONE(void) /** ** Test case: SC_1HZ_WAKEUP_MID with SC_AppData.NextProcNumber == SC_NONE **/ - CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl[SC_NUMBER_OF_ATS]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl[0]; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_InitTables(); - SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag = true; SC_AppData.NextProcNumber = SC_NONE; SC_AppData.NextCmdTime[SC_ATP] = 0; SC_AppData.CurrentTime = 0; /* Execute the function being tested */ - SC_ProcessRequest(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessRequest(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.NumCmdsSec == 0, "SC_OperData.NumCmdsSec == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRequest_Test_1HzWakeupNoSwitchPending(void) @@ -1723,45 +1083,25 @@ void SC_ProcessRequest_Test_1HzWakeupNoSwitchPending(void) /** ** Test case: SC_1HZ_WAKEUP_MID with SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag == false **/ - CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl[SC_NUMBER_OF_ATS]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl[0]; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_InitTables(); - SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag = false; SC_AppData.NextProcNumber = SC_NONE; SC_AppData.NextCmdTime[SC_ATP] = 0; SC_AppData.CurrentTime = 0; /* Execute the function being tested */ - SC_ProcessRequest(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessRequest(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.NumCmdsSec == 0, "SC_OperData.NumCmdsSec == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRequest_Test_1HzWakeupAtpNotExecutionTime(void) @@ -1769,46 +1109,24 @@ void SC_ProcessRequest_Test_1HzWakeupAtpNotExecutionTime(void) /** ** Test case: SC_1HZ_WAKEUP_MID with a pending ATP command that should not execute yet **/ - CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl[SC_NUMBER_OF_ATS]; - SC_RtpControlBlock_t RtsCtrlBlck; - - memset(&AtsCtrlBlck, 0, sizeof(AtsCtrlBlck)); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl[0]; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_InitTables(); - SC_OperData.AtsCtrlBlckAddr->SwitchPendFlag = true; SC_AppData.NextProcNumber = SC_ATP; SC_AppData.NextCmdTime[SC_ATP] = 1000; /* Execute the function being tested */ - SC_ProcessRequest(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessRequest(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.NumCmdsSec == 0, "SC_OperData.NumCmdsSec == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRequest_Test_1HzWakeupRtpExecutionTime(void) @@ -1817,24 +1135,7 @@ void SC_ProcessRequest_Test_1HzWakeupRtpExecutionTime(void) ** Test case: SC_1HZ_WAKEUP_MID with a pending RTP command that needs to execute immediately **/ CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl[SC_NUMBER_OF_ATS]; - SC_RtpControlBlock_t RtsCtrlBlck; - - memset(&AtsCtrlBlck, 0, sizeof(AtsCtrlBlck)); - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl[0]; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + SC_AtsEntryHeader_t *Entry; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); @@ -1846,13 +1147,8 @@ void SC_ProcessRequest_Test_1HzWakeupRtpExecutionTime(void) SC_CMDS_TEST_SC_UpdateNextTimeHook_RunCount = 0; UT_SetHookFunction(UT_KEY(SC_UpdateNextTime), Ut_SC_UpdateNextTimeHook, NULL); - SC_AtsEntryHeader_t *Entry; - - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; - Entry->CmdNumber = 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; + Entry->CmdNumber = 1; SC_AppData.NextProcNumber = SC_RTP; SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; /* Causes switch to ATP */ @@ -1866,13 +1162,10 @@ void SC_ProcessRequest_Test_1HzWakeupRtpExecutionTime(void) SC_AppData.AtsCmdIndexBuffer[0][0] = 0; /* Execute the function being tested */ - SC_ProcessRequest(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessRequest(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRequest_Test_1HzWakeupRtpExecutionTimeTooManyCmds(void) @@ -1883,25 +1176,7 @@ void SC_ProcessRequest_Test_1HzWakeupRtpExecutionTimeTooManyCmds(void) ** Test case: SC_1HZ_WAKEUP_MID with a pending RTP command that needs to execute immediately, but too many *commands are being sent at once **/ - CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtpControlBlock_t AtsCtrlBlck; - uint32 AtsCmdStatusTbl[SC_NUMBER_OF_ATS]; - SC_AtsInfoTable_t AtsInfoTbl[SC_NUMBER_OF_ATS]; - SC_RtpControlBlock_t RtsCtrlBlck; - - memset(&AtsCtrlBlck, 0, sizeof(AtsCtrlBlck)); - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCmdStatusTblAddr[0] = &AtsCmdStatusTbl[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &AtsCmdStatusTbl[1]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl[0]; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_1HZ_WAKEUP_MID); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); @@ -1910,8 +1185,6 @@ void SC_ProcessRequest_Test_1HzWakeupRtpExecutionTimeTooManyCmds(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); - SC_InitTables(); - SC_AppData.NextProcNumber = SC_RTP; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.NextCmdTime[SC_ATP] = 0; @@ -1919,15 +1192,12 @@ void SC_ProcessRequest_Test_1HzWakeupRtpExecutionTimeTooManyCmds(void) SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; /* Execute the function being tested */ - SC_ProcessRequest(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessRequest(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.NumCmdsSec == 0, "SC_OperData.NumCmdsSec == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessRequest_Test_MIDError(void) @@ -1937,31 +1207,18 @@ void SC_ProcessRequest_Test_MIDError(void) **/ CFE_SB_MsgId_t TestMsgId = SC_UT_MID_1; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Invalid command pipe message ID: 0x%%08lX"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); /* Execute the function being tested */ - SC_ProcessRequest(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessRequest(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "CmdCtr == 0"); UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_MID_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessCommand_Test_NoOp(void) @@ -1976,10 +1233,6 @@ void SC_ProcessCommand_Test_NoOp(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_NOOP_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "No-op command. Version %%d.%%d.%%d.%%d"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -1987,23 +1240,14 @@ void SC_ProcessCommand_Test_NoOp(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 0, "SC_OperData.HkPacket.CmdErrCtr == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_NOOP_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessCommand_Test_NoOpNoVerifyCmdLength(void) @@ -2023,16 +1267,13 @@ void SC_ProcessCommand_Test_NoOpNoVerifyCmdLength(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "SC_OperData.HkPacket.CmdCtr == 0"); UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 0, "SC_OperData.HkPacket.CmdErrCtr == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessCommand_Test_ResetCounters(void) @@ -2047,10 +1288,6 @@ void SC_ProcessCommand_Test_ResetCounters(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_RESET_COUNTERS_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Reset counters command"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); @@ -2058,7 +1295,7 @@ void SC_ProcessCommand_Test_ResetCounters(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "CmdCtr == 0"); @@ -2071,16 +1308,7 @@ void SC_ProcessCommand_Test_ResetCounters(void) UtAssert_True(SC_OperData.HkPacket.RtsActiveErrCtr == 0, "RtsActiveErrCtr == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RESET_DEB_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessCommand_Test_ResetCountersNoVerifyCmdLength(void) @@ -2100,13 +1328,10 @@ void SC_ProcessCommand_Test_ResetCountersNoVerifyCmdLength(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessCommand_Test_StartAts(void) @@ -2125,12 +1350,10 @@ void SC_ProcessCommand_Test_StartAts(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - UT_CmdBuf.StartAtsCmd.AtsId = 1; /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2151,10 +1374,8 @@ void SC_ProcessCommand_Test_StopAts(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2175,10 +1396,8 @@ void SC_ProcessCommand_Test_StartRts(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2199,10 +1418,8 @@ void SC_ProcessCommand_Test_StopRts(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2223,10 +1440,8 @@ void SC_ProcessCommand_Test_DisableRts(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2247,10 +1462,8 @@ void SC_ProcessCommand_Test_EnableRts(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2271,10 +1484,8 @@ void SC_ProcessCommand_Test_SwitchAts(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2295,10 +1506,8 @@ void SC_ProcessCommand_Test_JumpAts(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2319,10 +1528,8 @@ void SC_ProcessCommand_Test_ContinueAtsOnFailure(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2343,10 +1550,8 @@ void SC_ProcessCommand_Test_AppendAts(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2362,17 +1567,12 @@ void SC_ProcessCommand_Test_TableManageAtsTableNominal(void) **/ SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 0; @@ -2382,7 +1582,7 @@ void SC_ProcessCommand_Test_TableManageAtsTableNominal(void) UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_TBL_INFO_UPDATED); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2399,37 +1599,21 @@ void SC_ProcessCommand_Test_TableManageAtsTableGetAddressError(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS table manage process error: ATS = %%d, Result = 0x%%X"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - UT_CmdBuf.NotifyCmd.Payload.Parameter = SC_TBL_ID_ATS_0; /* Set to generate error message SC_TABLE_MANAGE_ATS_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, -1); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_TABLE_MANAGE_ATS_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessCommand_Test_TableManageAtsTableID(void) @@ -2443,17 +1627,12 @@ void SC_ProcessCommand_Test_TableManageAtsTableID(void) **/ SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 0; @@ -2464,7 +1643,7 @@ void SC_ProcessCommand_Test_TableManageAtsTableID(void) UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_TBL_INFO_UPDATED); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2472,26 +1651,13 @@ void SC_ProcessCommand_Test_TableManageAtsTableID(void) void SC_ProcessCommand_Test_TableManageAtsTable_InvalidIndex(void) { uint8 AtsIndex = SC_NUMBER_OF_ATS; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS table manage error: invalid ATS index %%d"); /* Execute the function being tested */ - SC_ManageAtsTable(AtsIndex); + UtAssert_VOIDCALL(SC_ManageAtsTable(AtsIndex)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_TABLE_MANAGE_ATS_INV_INDEX_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessCommand_Test_TableManageAtsTableGetAddressNeverLoaded(void) @@ -2505,17 +1671,12 @@ void SC_ProcessCommand_Test_TableManageAtsTableGetAddressNeverLoaded(void) **/ SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 0; @@ -2524,7 +1685,7 @@ void SC_ProcessCommand_Test_TableManageAtsTableGetAddressNeverLoaded(void) UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_TBL_ERR_NEVER_LOADED); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2540,17 +1701,12 @@ void SC_ProcessCommand_Test_TableManageAtsTableGetAddressSuccess(void) **/ SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 0; @@ -2559,7 +1715,7 @@ void SC_ProcessCommand_Test_TableManageAtsTableGetAddressSuccess(void) UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_SUCCESS); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2575,17 +1731,12 @@ void SC_ProcessCommand_Test_TableManageAppendTableNominal(void) **/ SC_AtsEntryHeader_t *Entry; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr; Entry->CmdNumber = 0; @@ -2595,7 +1746,7 @@ void SC_ProcessCommand_Test_TableManageAppendTableNominal(void) UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_TBL_INFO_UPDATED); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2612,37 +1763,21 @@ void SC_ProcessCommand_Test_TableManageAppendTableGetAddressError(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS Append table manage process error: Result = 0x%%X"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - UT_CmdBuf.NotifyCmd.Payload.Parameter = SC_TBL_ID_APPEND; /* Set to generate error message SC_TABLE_MANAGE_APPEND_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, -1); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_TABLE_MANAGE_APPEND_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessCommand_Test_TableManageAppendTableGetAddressNeverLoaded(void) @@ -2656,17 +1791,12 @@ void SC_ProcessCommand_Test_TableManageAppendTableGetAddressNeverLoaded(void) **/ SC_AtsEntryHeader_t *Entry; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr; Entry->CmdNumber = 0; @@ -2675,7 +1805,7 @@ void SC_ProcessCommand_Test_TableManageAppendTableGetAddressNeverLoaded(void) UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_TBL_ERR_NEVER_LOADED); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2691,17 +1821,12 @@ void SC_ProcessCommand_Test_TableManageAppendTableGetAddressSuccess(void) **/ SC_AtsEntryHeader_t *Entry; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr; Entry->CmdNumber = 0; @@ -2710,7 +1835,7 @@ void SC_ProcessCommand_Test_TableManageAppendTableGetAddressSuccess(void) UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_SUCCESS); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2725,24 +1850,19 @@ void SC_ProcessCommand_Test_TableManageRtsTableNominal(void) ** combine the tests for each command with the tests for reaching the command from SC_ProcessCommand. **/ - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - UT_CmdBuf.NotifyCmd.Payload.Parameter = SC_TBL_ID_RTS_0; /* Set to reach "SC_LoadRts(ArrayIndex)" */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_TBL_INFO_UPDATED); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2759,37 +1879,21 @@ void SC_ProcessCommand_Test_TableManageRtsTableGetAddressError(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "RTS table manage process error: RTS = %%d, Result = 0x%%X"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - UT_CmdBuf.NotifyCmd.Payload.Parameter = SC_TBL_ID_RTS_0; /* Set to generate error message SC_TABLE_MANAGE_RTS_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, -1); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_TABLE_MANAGE_RTS_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessCommand_Test_TableManageRtsTableID(void) @@ -2802,17 +1906,12 @@ void SC_ProcessCommand_Test_TableManageRtsTableID(void) ** combine the tests for each command with the tests for reaching the command from SC_ProcessCommand. **/ - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - /* test TableID >= SC_TBL_ID_RTS_0 */ UT_CmdBuf.NotifyCmd.Payload.Parameter = 0; @@ -2820,7 +1919,7 @@ void SC_ProcessCommand_Test_TableManageRtsTableID(void) UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_TBL_INFO_UPDATED); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2828,26 +1927,13 @@ void SC_ProcessCommand_Test_TableManageRtsTableID(void) void SC_ProcessCommand_Test_TableManageRtsTable_InvalidIndex(void) { uint8 RtsIndex = SC_NUMBER_OF_RTS; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS table manage error: invalid RTS index %%d"); /* Execute the function being tested */ - SC_ManageRtsTable(RtsIndex); + UtAssert_VOIDCALL(SC_ManageRtsTable(RtsIndex)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_TABLE_MANAGE_RTS_INV_INDEX_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessCommand_Test_TableManageRtsTableGetAddressNeverLoaded(void) @@ -2860,23 +1946,18 @@ void SC_ProcessCommand_Test_TableManageRtsTableGetAddressNeverLoaded(void) ** combine the tests for each command with the tests for reaching the command from SC_ProcessCommand. **/ - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - UT_CmdBuf.NotifyCmd.Payload.Parameter = SC_TBL_ID_RTS_0; UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_TBL_ERR_NEVER_LOADED); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2891,23 +1972,18 @@ void SC_ProcessCommand_Test_TableManageRtsTableGetAddressSuccess(void) ** combine the tests for each command with the tests for reaching the command from SC_ProcessCommand. **/ - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - UT_CmdBuf.NotifyCmd.Payload.Parameter = SC_TBL_ID_RTS_0; UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetAddress), 1, CFE_SUCCESS); /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2928,12 +2004,10 @@ void SC_ProcessCommand_Test_TableManageRtsInfo(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - UT_CmdBuf.NotifyCmd.Payload.Parameter = SC_TBL_ID_RTS_INFO; /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2954,12 +2028,10 @@ void SC_ProcessCommand_Test_TableManageRtpCtrl(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - UT_CmdBuf.NotifyCmd.Payload.Parameter = SC_TBL_ID_RTP_CTRL; /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -2980,12 +2052,10 @@ void SC_ProcessCommand_Test_TableManageAtsInfo(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - UT_CmdBuf.NotifyCmd.Payload.Parameter = SC_TBL_ID_ATS_INFO; /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -3006,12 +2076,10 @@ void SC_ProcessCommand_Test_TableManageAtpCtrl(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - UT_CmdBuf.NotifyCmd.Payload.Parameter = SC_TBL_ID_ATP_CTRL; /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -3032,12 +2100,10 @@ void SC_ProcessCommand_Test_TableManageAtsCmdStatus(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - UT_CmdBuf.NotifyCmd.Payload.Parameter = SC_TBL_ID_ATS_CMD_0; /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -3054,34 +2120,18 @@ void SC_ProcessCommand_Test_TableManageInvalidTableID(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_MANAGE_TABLE_CC; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Table manage command packet error: table ID = %%d"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - UT_CmdBuf.NotifyCmd.Payload.Parameter = 999; /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_TABLE_MANAGE_ID_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessCommand_Test_StartRtsGrp(void) @@ -3100,10 +2150,8 @@ void SC_ProcessCommand_Test_StartRtsGrp(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -3124,10 +2172,8 @@ void SC_ProcessCommand_Test_StopRtsGrp(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -3148,10 +2194,8 @@ void SC_ProcessCommand_Test_DisableRtsGrp(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -3172,10 +2216,8 @@ void SC_ProcessCommand_Test_EnableRtsGrp(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* This function is already verified to work correctly in another file, so no verifications here. */ } @@ -3192,35 +2234,19 @@ void SC_ProcessCommand_Test_InvalidCmdError(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = 99; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid Command Code: MID = 0x%%08lX CC = %%d"); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); - SC_InitTables(); - /* Execute the function being tested */ - SC_ProcessCommand(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_ProcessCommand(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "CmdCtr == 0"); UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_INVLD_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } /* Unreachable branches in sc_cmds.c SC_ProcessAtpCmd:236, 274, 310. diff --git a/unit-test/sc_loads_tests.c b/unit-test/sc_loads_tests.c index 33016d0..15ab500 100644 --- a/unit-test/sc_loads_tests.c +++ b/unit-test/sc_loads_tests.c @@ -40,13 +40,6 @@ #include "utassert.h" #include "utstubs.h" -/* sc_loads_tests globals */ -uint8 call_count_CFE_EVS_SendEvent; - -uint32 SC_APP_TEST_GlobalAtsCmdStatusTbl[SC_NUMBER_OF_ATS * SC_MAX_ATS_CMDS]; - -SC_AtpControlBlock_t SC_APP_TEST_GlobalAtsCtrlBlck; - /* * Function Definitions */ @@ -74,19 +67,8 @@ void SC_LoadAts_Test_Nominal(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); size_t MsgSize = sizeof(SC_NoArgsCmd_t); SC_AtsEntryHeader_t *Entry; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; uint8 AtsIndex = 0; - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - memset(&AtsTable, 0, sizeof(AtsTable)); - - SC_InitTables(); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; Entry->CmdNumber = 1; @@ -111,8 +93,6 @@ void SC_LoadAts_Test_Nominal(void) void SC_LoadAts_Test_CmdRunOffEndOfBuffer(void) { SC_AtsEntryHeader_t *Entry; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; uint8 AtsIndex = 0; size_t MsgSize; int BufEntrySize; @@ -120,14 +100,6 @@ void SC_LoadAts_Test_CmdRunOffEndOfBuffer(void) int i; int j; - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - - SC_InitTables(); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - /* Causes CFE_MSG_GetSize to satisfy the conditions of if-statement below comment "if the length of the command is * valid", but NOT the if-statement immediately after */ MsgSize = SC_PACKET_MAX_SIZE; @@ -139,8 +111,6 @@ void SC_LoadAts_Test_CmdRunOffEndOfBuffer(void) Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; Entry->CmdNumber = i + 1; - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][j] = SC_EMPTY; - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); } @@ -157,33 +127,18 @@ void SC_LoadAts_Test_CmdRunOffEndOfBuffer(void) UtAssert_True(SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0, "SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_LoadAts_Test_CmdLengthInvalid(void) { size_t MsgSize; SC_AtsEntryHeader_t *Entry; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; uint8 AtsIndex = 0; - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - - SC_InitTables(); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; Entry->CmdNumber = 1; - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][0] = SC_EMPTY; - /* Set to make the if-statement below comment "if the length of the command is valid" fail */ MsgSize = SC_PACKET_MAX_SIZE + 1; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); @@ -201,33 +156,18 @@ void SC_LoadAts_Test_CmdLengthInvalid(void) UtAssert_True(SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0, "SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_LoadAts_Test_CmdLengthZero(void) { size_t MsgSize; SC_AtsEntryHeader_t *Entry; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; uint8 AtsIndex = 0; - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - - SC_InitTables(); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; Entry->CmdNumber = 1; - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][0] = SC_EMPTY; - /* Set to make the if-statement below comment "if the length of the command is valid" fail */ MsgSize = 0; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); @@ -245,33 +185,18 @@ void SC_LoadAts_Test_CmdLengthZero(void) UtAssert_True(SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0, "SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_LoadAts_Test_CmdNumberInvalid(void) { size_t MsgSize; SC_AtsEntryHeader_t *Entry; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; uint8 AtsIndex = 0; - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - - SC_InitTables(); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; Entry->CmdNumber = SC_MAX_ATS_CMDS * 2; - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][0] = SC_EMPTY; - /* Set to make the if-statement below comment "if the length of the command is valid" fail */ MsgSize = SC_PACKET_MAX_SIZE + 1; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); @@ -289,33 +214,18 @@ void SC_LoadAts_Test_CmdNumberInvalid(void) UtAssert_True(SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0, "SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_LoadAts_Test_EndOfLoadReached(void) { size_t MsgSize; SC_AtsEntryHeader_t *Entry; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; uint8 AtsIndex = 0; - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - - SC_InitTables(); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; Entry->CmdNumber = 0; - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][0] = SC_EMPTY; - /* Set to make the if-statement below comment "if the length of the command is valid" fail */ MsgSize = SC_PACKET_MAX_SIZE + 1; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); @@ -333,17 +243,12 @@ void SC_LoadAts_Test_EndOfLoadReached(void) UtAssert_True(SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0, "SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_LoadAts_Test_AtsBufferTooSmall(void) { SC_AtsEntryHeader_t *Entry; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; uint8 AtsIndex = 0; size_t MsgSize1; size_t MsgSize2; @@ -352,14 +257,6 @@ void SC_LoadAts_Test_AtsBufferTooSmall(void) int i; int j; - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - - SC_InitTables(); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - /* Set to reach block of code starting with comment "even the smallest command will not fit in the buffer" */ MsgSize1 = SC_PACKET_MAX_SIZE; BufEntrySize = ((MsgSize1 + SC_ROUND_UP_BYTES) / SC_BYTES_IN_WORD) + SC_ATS_HDR_NOPKT_WORDS; @@ -367,16 +264,14 @@ void SC_LoadAts_Test_AtsBufferTooSmall(void) for (i = 0, j = 0; i < MaxBufEntries; i++, j += BufEntrySize) { - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; - Entry->CmdNumber = i + 1; - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][j] = SC_EMPTY; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; + Entry->CmdNumber = i + 1; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize1, sizeof(MsgSize1), false); } /* Next entry should not leave enough buffer space for an ATS command header */ - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; - Entry->CmdNumber = i++ + 1; - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][j] = SC_EMPTY; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; + Entry->CmdNumber = i++ + 1; /* Use the remaining buffer space to calculate the final message size */ MsgSize2 = (SC_ATS_BUFF_SIZE32 - SC_ATS_HDR_WORDS - j) * SC_BYTES_IN_WORD; @@ -388,8 +283,6 @@ void SC_LoadAts_Test_AtsBufferTooSmall(void) Entry->CmdNumber = i + 1; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize1, sizeof(MsgSize1), false); - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][j] = SC_EMPTY; - /* Execute the function being tested */ SC_LoadAts(AtsIndex); @@ -403,17 +296,12 @@ void SC_LoadAts_Test_AtsBufferTooSmall(void) UtAssert_True(SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0, "SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_LoadAts_Test_AtsEntryOverflow(void) { SC_AtsEntryHeader_t *Entry; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; uint8 AtsIndex = 0; size_t MsgSize1; size_t MsgSize2; @@ -422,31 +310,20 @@ void SC_LoadAts_Test_AtsEntryOverflow(void) int i; int j; - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - memset(&AtsTable, 0, sizeof(AtsTable)); - - SC_InitTables(); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - MsgSize1 = SC_PACKET_MAX_SIZE; BufEntrySize = ((MsgSize1 + SC_ROUND_UP_BYTES) / SC_BYTES_IN_WORD) + SC_ATS_HDR_NOPKT_WORDS; MaxBufEntries = SC_ATS_BUFF_SIZE32 / BufEntrySize; for (i = 0, j = 0; i < MaxBufEntries; i++, j += BufEntrySize) { - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; - Entry->CmdNumber = i + 1; - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][j] = SC_EMPTY; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; + Entry->CmdNumber = i + 1; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize1, sizeof(MsgSize1), false); } /* Next entry should not leave enough buffer space for an ATS command header */ - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; - Entry->CmdNumber = i++ + 1; - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][j] = SC_EMPTY; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; + Entry->CmdNumber = i++ + 1; /* Use the remaining buffer space to calculate the final message size */ MsgSize2 = (SC_ATS_BUFF_SIZE32 - SC_ATS_HDR_WORDS + 4 - j) * SC_BYTES_IN_WORD; @@ -458,23 +335,16 @@ void SC_LoadAts_Test_AtsEntryOverflow(void) Entry->CmdNumber = i + 1; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize1, sizeof(MsgSize1), false); - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][j] = SC_EMPTY; - /* Execute the function being tested */ SC_LoadAts(AtsIndex); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_LoadAts_Test_LoadExactlyBufferLength(void) { SC_AtsEntryHeader_t *Entry; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; uint8 AtsIndex = 0; size_t MsgSize1; size_t MsgSize2; @@ -483,12 +353,6 @@ void SC_LoadAts_Test_LoadExactlyBufferLength(void) int i; int j; - SC_InitTables(); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - /* Set to reach block of code starting with comment "we encountered a load exactly as long as the buffer" */ MsgSize1 = SC_PACKET_MAX_SIZE; BufEntrySize = (MsgSize1 + SC_ROUND_UP_BYTES + SC_ATS_HEADER_SIZE) / SC_BYTES_IN_WORD; @@ -496,16 +360,14 @@ void SC_LoadAts_Test_LoadExactlyBufferLength(void) for (i = 0, j = 0; i < MaxBufEntries; i++, j += BufEntrySize) { - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; - Entry->CmdNumber = i + 1; - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][j] = SC_EMPTY; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; + Entry->CmdNumber = i + 1; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize1, sizeof(MsgSize1), false); } /* Next entry should not leave enough buffer space for an ATS command header */ - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; - Entry->CmdNumber = i++ + 1; - SC_OperData.AtsCmdStatusTblAddr[AtsIndex][j] = SC_EMPTY; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][j]; + Entry->CmdNumber = i++ + 1; /* Use the remaining buffer space to calculate the final message size */ MsgSize2 = ((SC_ATS_BUFF_SIZE32 - SC_ATS_HDR_NOPKT_WORDS - j) * SC_BYTES_IN_WORD); @@ -515,10 +377,7 @@ void SC_LoadAts_Test_LoadExactlyBufferLength(void) SC_LoadAts(AtsIndex); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_LoadAts_Test_CmdNotEmpty(void) @@ -526,20 +385,9 @@ void SC_LoadAts_Test_CmdNotEmpty(void) CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); size_t MsgSize = sizeof(SC_NoArgsCmd_t); SC_AtsEntryHeader_t *Entry; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; uint8 AtsIndex = 0; uint8 EntryLoc; - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - memset(&AtsTable, 0, sizeof(AtsTable)); - - SC_InitTables(); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; Entry->CmdNumber = 1; @@ -574,36 +422,19 @@ void SC_LoadAts_Test_InvalidIndex(void) /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_LOADATS_INV_INDEX_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_BuildTimeIndexTable_Test_InvalidIndex(void) { uint8 AtsIndex = SC_NUMBER_OF_ATS; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Build time index table error: invalid ATS index %%d"); - - SC_InitTables(); /* Execute the function being tested */ SC_BuildTimeIndexTable(AtsIndex); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_BUILD_TIME_IDXTBL_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_Insert_Test(void) @@ -612,8 +443,6 @@ void SC_Insert_Test(void) uint8 ListLength = 1; uint8 NewCmdIndex = 0; - SC_InitTables(); - SC_AppData.AtsTimeIndexBuffer[AtsIndex][0] = 1; /* Execute the function being tested */ @@ -625,10 +454,7 @@ void SC_Insert_Test(void) UtAssert_True(SC_AppData.AtsTimeIndexBuffer[AtsIndex][1] == NewCmdIndex + 1, "SC_AppData.AtsTimeIndexBuffer[AtsIndex][1] == NewCmdIndex"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_Insert_Test_MiddleOfList(void) @@ -641,8 +467,6 @@ void SC_Insert_Test_MiddleOfList(void) "new cmd will execute at same time or after this list entry" */ UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, false); - SC_InitTables(); - SC_AppData.AtsTimeIndexBuffer[AtsIndex][0] = 1; /* Execute the function being tested */ @@ -654,10 +478,7 @@ void SC_Insert_Test_MiddleOfList(void) UtAssert_True(SC_AppData.AtsTimeIndexBuffer[AtsIndex][1] == NewCmdIndex + 1, "SC_AppData.AtsTimeIndexBuffer[AtsIndex][1] == NewCmdIndex+1"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_Insert_Test_MiddleOfListCompareAbsTimeTrue(void) @@ -670,8 +491,6 @@ void SC_Insert_Test_MiddleOfListCompareAbsTimeTrue(void) "new cmd will execute at same time or after this list entry" */ UT_SetDeferredRetcode(UT_KEY(SC_CompareAbsTime), 1, true); - SC_InitTables(); - SC_AppData.AtsTimeIndexBuffer[AtsIndex][0] = 1; /* Execute the function being tested */ @@ -683,10 +502,7 @@ void SC_Insert_Test_MiddleOfListCompareAbsTimeTrue(void) UtAssert_True(SC_AppData.AtsTimeIndexBuffer[AtsIndex][1] == NewCmdIndex + 1, "SC_AppData.AtsTimeIndexBuffer[AtsIndex][1] == NewCmdIndex+1"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_Insert_Test_InvalidIndex(void) @@ -694,300 +510,177 @@ void SC_Insert_Test_InvalidIndex(void) uint8 AtsIndex = SC_NUMBER_OF_ATS; uint8 ListLength = 1; uint8 NewCmdIndex = 0; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS insert error: invalid ATS index %%d"); - - SC_InitTables(); /* Execute the function being tested */ SC_Insert(AtsIndex, NewCmdIndex, ListLength); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_INSERTATS_INV_INDEX_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_InitAtsTables_Test_InvalidIndex(void) { uint8 AtsIndex = SC_NUMBER_OF_ATS; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS table init error: invalid ATS index %%d"); /* Execute the function being tested */ SC_InitAtsTables(AtsIndex); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_INIT_ATSTBL_INV_INDEX_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ValidateAts_Test(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_InitTables(); - - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; - Entry->CmdNumber = 0; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; + Entry->CmdNumber = 0; /* Execute the function being tested */ - Result = SC_ValidateAts((uint16 *)(SC_OperData.AtsTblAddr[AtsIndex])); + UtAssert_INT32_EQ(SC_ValidateAts((uint16 *)(SC_OperData.AtsTblAddr[AtsIndex])), SC_ERROR); /* Verify results */ - UtAssert_True(Result == SC_ERROR, "Result == SC_ERROR"); - - 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); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_VERIFY_ATS_MPT_ERR_EID); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ValidateAppend_Test(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - - SC_InitTables(); - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; - Entry->CmdNumber = 0; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; + Entry->CmdNumber = 0; /* Execute the function being tested */ - Result = SC_ValidateAppend((SC_OperData.AtsTblAddr[AtsIndex])); + UtAssert_INT32_EQ(SC_ValidateAppend((SC_OperData.AtsTblAddr[AtsIndex])), SC_ERROR); /* Verify results */ - UtAssert_True(Result == SC_ERROR, "Result == SC_ERROR"); - - 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); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_VERIFY_ATS_MPT_ERR_EID); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ValidateRts_Test(void) { SC_RtsEntryHeader_t *Entry; - uint8 RtsIndex = 0; - int16 Result; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; + uint8 RtsIndex = 0; CFE_SB_MsgId_t TestMsgId = CFE_SB_INVALID_MSG_ID; size_t MsgSize = SC_PACKET_MIN_SIZE; - SC_InitTables(); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; - Entry->TimeTag = 1; + Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; + Entry->TimeTag = 1; /* The MsgId and MsgSize are here to satisfy TSF */ UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_ValidateRts((uint16 *)(SC_OperData.RtsTblAddr[RtsIndex])); + UtAssert_INT32_EQ(SC_ValidateRts((uint16 *)(SC_OperData.RtsTblAddr[RtsIndex])), SC_ERROR); /* Verify results */ - UtAssert_True(Result == SC_ERROR, "Result == SC_ERROR"); - - 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); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_INVLD_MID_ERR_EID); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ValidateRts_Test_ParseRts(void) { SC_RtsEntryHeader_t *Entry; - uint8 RtsIndex = 0; - int16 Result; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; + uint8 RtsIndex = 0; CFE_SB_MsgId_t TestMsgId = CFE_SB_INVALID_MSG_ID; size_t MsgSize = SC_PACKET_MIN_SIZE; - SC_InitTables(); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; - Entry->TimeTag = 0; + Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; + Entry->TimeTag = 0; /* The MsgId and MsgSize are here to satisfy TSF */ UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_ValidateRts((uint16 *)(SC_OperData.RtsTblAddr[RtsIndex])); + UtAssert_INT32_EQ(SC_ValidateRts((uint16 *)(SC_OperData.RtsTblAddr[RtsIndex])), CFE_SUCCESS); /* Verify results */ - UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_LoadRts_Test_Nominal(void) { uint8 AtsIndex = 0; - SC_InitTables(); - /* Execute the function being tested */ - SC_LoadRts(AtsIndex); + UtAssert_VOIDCALL(SC_LoadRts(AtsIndex)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_LoadRts_Test_InvalidIndex(void) { uint8 RtsIndex = SC_NUMBER_OF_RTS; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS table init error: invalid RTS index %%d"); /* Execute the function being tested */ - SC_LoadRts(RtsIndex); + UtAssert_VOIDCALL(SC_LoadRts(RtsIndex)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_LOADRTS_INV_INDEX_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ParseRts_Test_EndOfFile(void) { SC_RtsEntryHeader_t *Entry; - uint8 RtsIndex = 0; - int16 Result; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; + uint8 RtsIndex = 0; CFE_SB_MsgId_t TestMsgId = CFE_SB_INVALID_MSG_ID; size_t MsgSize = SC_PACKET_MIN_SIZE; - SC_InitTables(); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; - Entry->TimeTag = 0; + Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; + Entry->TimeTag = 0; /* Set these to satisfy if-statement to reach line with comment "assumed end of file" */ UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex]); + UtAssert_BOOL_TRUE(SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex])); /* Verify results */ - UtAssert_True(Result == true, "Result == true"); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ParseRts_Test_InvalidMsgId(void) { SC_RtsEntryHeader_t *Entry; - uint8 RtsIndex = 0; - int16 Result; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; + uint8 RtsIndex = 0; CFE_SB_MsgId_t TestMsgId = CFE_SB_INVALID_MSG_ID; size_t MsgSize = SC_PACKET_MIN_SIZE; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS cmd loaded with invalid MID at %%d"); - SC_InitTables(); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; - Entry->TimeTag = 1; + Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; + Entry->TimeTag = 1; /* Set to generate error message SC_RTS_INVLD_MID_ERR_EID */ UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex]); + UtAssert_BOOL_FALSE(SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex])); /* Verify results */ - UtAssert_True(Result == false, "Result == false"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_INVLD_MID_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ParseRts_Test_LengthErrorTooShort(void) { SC_RtsEntryHeader_t *Entry; - uint8 RtsIndex = 0; - int16 Result; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; + uint8 RtsIndex = 0; CFE_SB_MsgId_t TestMsgId = SC_UT_MID_1; size_t MsgSize = 0; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "RTS cmd loaded with invalid length at %%d, len: %%d"); - - SC_InitTables(); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; - Entry->TimeTag = 1; + Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; + Entry->TimeTag = 1; /* Set to generate error message SC_RTS_INVLD_MID_ERR_EID */ UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); @@ -995,43 +688,22 @@ void SC_ParseRts_Test_LengthErrorTooShort(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex]); + UtAssert_BOOL_FALSE(SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex])); /* Verify results */ - UtAssert_True(Result == false, "Result == false"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_LEN_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ParseRts_Test_LengthErrorTooLong(void) { SC_RtsEntryHeader_t *Entry; - uint8 RtsIndex = 0; - int16 Result; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; + uint8 RtsIndex = 0; CFE_SB_MsgId_t TestMsgId = SC_UT_MID_1; size_t MsgSize = SC_PACKET_MAX_SIZE + 1; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "RTS cmd loaded with invalid length at %%d, len: %%d"); - - SC_InitTables(); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; - Entry->TimeTag = 1; + Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; + Entry->TimeTag = 1; /* Set to generate error message SC_RTS_LEN_ERR_EID as a result of length being too long */ UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false); @@ -1039,45 +711,23 @@ void SC_ParseRts_Test_LengthErrorTooLong(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex]); + UtAssert_BOOL_FALSE(SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex])); /* Verify results */ - UtAssert_True(Result == false, "Result == false"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_LEN_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ParseRts_Test_CmdRunsOffEndOfBuffer(void) { SC_RtsEntryHeader_t *Entry; - uint8 RtsIndex = 0; - int16 Result; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; + uint8 RtsIndex = 0; CFE_SB_MsgId_t TestMsgId = SC_UT_MID_1; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - int32 BufUnused = sizeof(RtsTable); - - memset(&RtsTable, 0, sizeof(RtsTable)); - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS cmd at %%d runs off end of buffer"); + int32 BufUnused = SC_RTS_BUFF_SIZE32 * SC_BYTES_IN_WORD; - SC_InitTables(); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; - Entry->TimeTag = 1; + Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; + Entry->TimeTag = 1; while (BufUnused > 0) { @@ -1104,22 +754,11 @@ void SC_ParseRts_Test_CmdRunsOffEndOfBuffer(void) } /* Execute the function being tested */ - Result = SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex]); + UtAssert_BOOL_FALSE(SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex])); /* Verify results */ - UtAssert_True(Result == false, "Result == false"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_LEN_BUFFER_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ParseRts_Test_CmdLengthEqualsBufferLength(void) @@ -1127,20 +766,13 @@ void SC_ParseRts_Test_CmdLengthEqualsBufferLength(void) /* Also tests the case where CmdLength is less than the buffer length */ SC_RtsEntryHeader_t *Entry; - uint8 RtsIndex = 0; - int16 Result; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; + uint8 RtsIndex = 0; CFE_SB_MsgId_t TestMsgId = SC_UT_MID_1; size_t MsgSize; - size_t BufUnused = sizeof(RtsTable); + size_t BufUnused = SC_RTS_BUFF_SIZE32 * SC_BYTES_IN_WORD; - memset(&RtsTable, 0, sizeof(RtsTable)); - - SC_InitTables(); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; - Entry->TimeTag = 1; + Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; + Entry->TimeTag = 1; /* Fill buffer with packets */ while (BufUnused != 0) @@ -1168,30 +800,18 @@ void SC_ParseRts_Test_CmdLengthEqualsBufferLength(void) } /* Execute the function being tested */ - Result = SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex]); + UtAssert_BOOL_TRUE(SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex])); /* Verify results */ - UtAssert_True(Result == true, "Result == true"); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ParseRts_Test_CmdDoesNotFitBufferEmpty(void) { - uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; + uint8 RtsIndex = 0; CFE_SB_MsgId_t TestMsgId = SC_UT_MID_1; size_t MsgSize; - size_t BufUnused = sizeof(RtsTable); - - SC_InitTables(); - - memset(&RtsTable, 0, sizeof(RtsTable)); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; + size_t BufUnused = SC_RTS_BUFF_SIZE32 * SC_BYTES_IN_WORD; /* Fill buffer with packets */ while (BufUnused > SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE) @@ -1225,22 +845,13 @@ void SC_ParseRts_Test_CmdDoesNotFitBufferEmpty(void) void SC_ParseRts_Test_CmdDoesNotFitBufferNotEmpty(void) { - uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; + uint8 RtsIndex = 0; CFE_SB_MsgId_t TestMsgId = SC_UT_MID_1; size_t MsgSize; - size_t BufUnused = sizeof(RtsTable); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; + size_t BufUnused = SC_RTS_BUFF_SIZE32 * SC_BYTES_IN_WORD; /* Filling the table so it is considered used wherever checked */ - memset(&RtsTable, 0xff, sizeof(RtsTable)); - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS cmd loaded won't fit in buffer at %%d"); - - SC_InitTables(); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; + memset(SC_OperData.RtsTblAddr[RtsIndex], 0xff, SC_RTS_BUFF_SIZE32 * SC_BYTES_IN_WORD); /* Fill buffer with packets */ while (BufUnused > SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE) @@ -1269,14 +880,8 @@ void SC_ParseRts_Test_CmdDoesNotFitBufferNotEmpty(void) /* Execute the function being tested */ UtAssert_BOOL_FALSE(SC_ParseRts(SC_OperData.RtsTblAddr[RtsIndex])); - UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_LEN_TOO_LONG_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_UpdateAppend_Test_Nominal(void) @@ -1285,20 +890,10 @@ void SC_UpdateAppend_Test_Nominal(void) SC_AtsEntryHeader_t *Entry; uint8 EntryIndex = 0; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Update Append ATS Table: load count = %%d, command count = %%d, byte count = %%d"); - - SC_InitTables(); - - memset(&AtsAppendTable, 0, sizeof(AtsAppendTable)); - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[EntryIndex]; - Entry->CmdNumber = 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[EntryIndex]; + Entry->CmdNumber = 1; /* Set to reach code block starting with comment "Compute buffer index for next Append ATS table entry" */ MsgSize = 50; @@ -1307,7 +902,7 @@ void SC_UpdateAppend_Test_Nominal(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - SC_UpdateAppend(); + UtAssert_VOIDCALL(SC_UpdateAppend()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); @@ -1315,37 +910,17 @@ void SC_UpdateAppend_Test_Nominal(void) UtAssert_True(SC_AppData.AppendWordCount == 15, "SC_AppData.AppendWordCount == 15"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_UpdateAppend_Test_CmdDoesNotFitBuffer(void) { SC_AtsEntryHeader_t *Entry; uint8 EntryIndex = 0; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; size_t MsgSize; int BufEntrySize; int MaxBufEntries; int j; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Update Append ATS Table: load count = %%d, command count = %%d, byte count = %%d"); - - SC_InitTables(); - - memset(&AtsAppendTable, 0, sizeof(AtsAppendTable)); - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; /* Set to reach code block starting with comment "Compute buffer index for next Append ATS table entry" */ MsgSize = SC_PACKET_MAX_SIZE; @@ -1360,7 +935,7 @@ void SC_UpdateAppend_Test_CmdDoesNotFitBuffer(void) } /* Execute the function being tested */ - SC_UpdateAppend(); + UtAssert_VOIDCALL(SC_UpdateAppend()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); @@ -1368,36 +943,17 @@ void SC_UpdateAppend_Test_CmdDoesNotFitBuffer(void) UtAssert_True(SC_AppData.AppendWordCount == 1980, "SC_AppData.AppendWordCount == 1980"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_UpdateAppend_Test_InvalidCmdLengthTooLow(void) { SC_AtsEntryHeader_t *Entry; uint8 EntryIndex = 0; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Update Append ATS Table: load count = %%d, command count = %%d, byte count = %%d"); - SC_InitTables(); - - memset(&AtsAppendTable, 0, sizeof(AtsAppendTable)); - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[EntryIndex]; - Entry->CmdNumber = 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[EntryIndex]; + Entry->CmdNumber = 1; /* Set to satisfy condition "(CommandBytes < SC_PACKET_MIN_SIZE)" */ MsgSize = SC_PACKET_MIN_SIZE - 1; @@ -1405,7 +961,7 @@ void SC_UpdateAppend_Test_InvalidCmdLengthTooLow(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - SC_UpdateAppend(); + UtAssert_VOIDCALL(SC_UpdateAppend()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); @@ -1413,36 +969,17 @@ void SC_UpdateAppend_Test_InvalidCmdLengthTooLow(void) UtAssert_True(SC_AppData.AppendWordCount == 0, "SC_AppData.AppendWordCount == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_UpdateAppend_Test_InvalidCmdLengthTooHigh(void) { SC_AtsEntryHeader_t *Entry; uint8 EntryIndex = 0; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Update Append ATS Table: load count = %%d, command count = %%d, byte count = %%d"); - - SC_InitTables(); - memset(&AtsAppendTable, 0, sizeof(AtsAppendTable)); - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[EntryIndex]; - Entry->CmdNumber = 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[EntryIndex]; + Entry->CmdNumber = 1; /* Set to satisfy condition "(CommandBytes > SC_PACKET_MAX_SIZE)" */ MsgSize = SC_PACKET_MAX_SIZE * 2; @@ -1450,7 +987,7 @@ void SC_UpdateAppend_Test_InvalidCmdLengthTooHigh(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - SC_UpdateAppend(); + UtAssert_VOIDCALL(SC_UpdateAppend()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); @@ -1458,38 +995,18 @@ void SC_UpdateAppend_Test_InvalidCmdLengthTooHigh(void) UtAssert_True(SC_AppData.AppendWordCount == 0, "SC_AppData.AppendWordCount == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_UpdateAppend_Test_EndOfBuffer(void) { SC_AtsEntryHeader_t *Entry; uint8 EntryIndex = 0; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; size_t MsgSize1; size_t MsgSize2; int BufEntrySize; int MaxBufEntries; int j; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Update Append ATS Table: load count = %%d, command count = %%d, byte count = %%d"); - - SC_InitTables(); - - memset(&AtsAppendTable, 0, sizeof(AtsAppendTable)); - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; /* Cause condition to be met: "(EntryIndex >= SC_APPEND_BUFF_SIZE)" */ MsgSize1 = SC_PACKET_MAX_SIZE; @@ -1509,7 +1026,7 @@ void SC_UpdateAppend_Test_EndOfBuffer(void) } /* Execute the function being tested */ - SC_UpdateAppend(); + UtAssert_VOIDCALL(SC_UpdateAppend()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); @@ -1517,16 +1034,7 @@ void SC_UpdateAppend_Test_EndOfBuffer(void) UtAssert_True(SC_AppData.AppendWordCount == 2000, "SC_AppData.AppendWordCount == 2000"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_UpdateAppend_Test_CmdNumberZero(void) @@ -1535,20 +1043,10 @@ void SC_UpdateAppend_Test_CmdNumberZero(void) SC_AtsEntryHeader_t *Entry; uint8 EntryIndex = 0; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Update Append ATS Table: load count = %%d, command count = %%d, byte count = %%d"); - - SC_InitTables(); - - memset(&AtsAppendTable, 0, sizeof(AtsAppendTable)); - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[EntryIndex]; - Entry->CmdNumber = 0; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[EntryIndex]; + Entry->CmdNumber = 0; /* Cause condition to be met: "(Entry->CmdNumber == 0)" */ MsgSize = 50; @@ -1556,7 +1054,7 @@ void SC_UpdateAppend_Test_CmdNumberZero(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - SC_UpdateAppend(); + UtAssert_VOIDCALL(SC_UpdateAppend()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); @@ -1564,16 +1062,7 @@ void SC_UpdateAppend_Test_CmdNumberZero(void) UtAssert_True(SC_AppData.AppendWordCount == 0, "SC_AppData.AppendWordCount == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_UpdateAppend_Test_CmdNumberTooHigh(void) @@ -1582,20 +1071,10 @@ void SC_UpdateAppend_Test_CmdNumberTooHigh(void) SC_AtsEntryHeader_t *Entry; uint8 EntryIndex = 0; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Update Append ATS Table: load count = %%d, command count = %%d, byte count = %%d"); - SC_InitTables(); - - memset(&AtsAppendTable, 0, sizeof(AtsAppendTable)); - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[EntryIndex]; - Entry->CmdNumber = SC_MAX_ATS_CMDS + 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[EntryIndex]; + Entry->CmdNumber = SC_MAX_ATS_CMDS + 1; /* Cause condition to be met: "(Entry->CmdNumber > SC_MAX_ATS_CMDS)" */ MsgSize = 50; @@ -1603,7 +1082,7 @@ void SC_UpdateAppend_Test_CmdNumberTooHigh(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - SC_UpdateAppend(); + UtAssert_VOIDCALL(SC_UpdateAppend()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.AppendLoadCount == 1, "SC_OperData.HkPacket.AppendLoadCount == 1"); @@ -1611,39 +1090,15 @@ void SC_UpdateAppend_Test_CmdNumberTooHigh(void) UtAssert_True(SC_AppData.AppendWordCount == 0, "SC_AppData.AppendWordCount == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_UPDATE_APPEND_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ProcessAppend_Test(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; size_t MsgSize; - SC_InitTables(); - - memset(&AtsTable, 0, sizeof(AtsTable)); - memset(&AtsAppendTable, 0, sizeof(AtsAppendTable)); - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - SC_OperData.AtsCtrlBlckAddr = &SC_APP_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[AtsIndex]; Entry->CmdNumber = 1; @@ -1667,7 +1122,7 @@ void SC_ProcessAppend_Test(void) UT_SetDeferredRetcode(UT_KEY(SC_BeginAts), 1, true); /* Execute the function being tested */ - SC_ProcessAppend(AtsIndex); + UtAssert_VOIDCALL(SC_ProcessAppend(AtsIndex)); /* Verify results */ UtAssert_True(SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 1, @@ -1680,33 +1135,15 @@ void SC_ProcessAppend_Test(void) UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING, "SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessAppend_Test_CmdLoaded(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; size_t MsgSize; - SC_InitTables(); - - memset(&AtsTable, 0, sizeof(AtsTable)); - memset(&AtsAppendTable, 0, sizeof(AtsAppendTable)); - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - SC_OperData.AtsCtrlBlckAddr = &SC_APP_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[AtsIndex]; Entry->CmdNumber = 1; @@ -1727,7 +1164,7 @@ void SC_ProcessAppend_Test_CmdLoaded(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - SC_ProcessAppend(AtsIndex); + UtAssert_VOIDCALL(SC_ProcessAppend(AtsIndex)); /* Verify results */ UtAssert_True(SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 1, @@ -1740,33 +1177,15 @@ void SC_ProcessAppend_Test_CmdLoaded(void) UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING, "SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessAppend_Test_NotExecuting(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; size_t MsgSize; - SC_InitTables(); - - memset(&AtsTable, 0, sizeof(AtsTable)); - memset(&AtsAppendTable, 0, sizeof(AtsAppendTable)); - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - SC_OperData.AtsCtrlBlckAddr = &SC_APP_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[AtsIndex]; Entry->CmdNumber = 1; @@ -1787,7 +1206,7 @@ void SC_ProcessAppend_Test_NotExecuting(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - SC_ProcessAppend(AtsIndex); + UtAssert_VOIDCALL(SC_ProcessAppend(AtsIndex)); /* Verify results */ UtAssert_True(SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 1, @@ -1799,33 +1218,15 @@ void SC_ProcessAppend_Test_NotExecuting(void) "SC_OperData.AtsCmdStatusTblAddr[AtsIndex][0] == SC_LOADED"); UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_IDLE, "SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessAppend_Test_AtsNumber(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - SC_AtsInfoTable_t AtsInfoTbl; - uint32 AtsAppendTable[SC_APPEND_BUFF_SIZE32]; size_t MsgSize; - SC_InitTables(); - - memset(&AtsTable, 0, sizeof(AtsTable)); - memset(&AtsAppendTable, 0, sizeof(AtsAppendTable)); - memset(&AtsInfoTbl, 0, sizeof(AtsInfoTbl)); - - SC_OperData.AtsCmdStatusTblAddr[AtsIndex] = &SC_APP_TEST_GlobalAtsCmdStatusTbl[0]; - SC_OperData.AtsInfoTblAddr = &AtsInfoTbl; - SC_OperData.AtsCtrlBlckAddr = &SC_APP_TEST_GlobalAtsCtrlBlck; - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - SC_OperData.AppendTblAddr = &AtsAppendTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AppendTblAddr[AtsIndex]; Entry->CmdNumber = 1; @@ -1846,7 +1247,7 @@ void SC_ProcessAppend_Test_AtsNumber(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - SC_ProcessAppend(AtsIndex); + UtAssert_VOIDCALL(SC_ProcessAppend(AtsIndex)); /* Verify results */ UtAssert_True(SC_OperData.AtsInfoTblAddr[AtsIndex].AtsSize == 1, @@ -1859,36 +1260,19 @@ void SC_ProcessAppend_Test_AtsNumber(void) UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING, "SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_ProcessAppend_Test_InvalidIndex(void) { uint8 AtsIndex = SC_NUMBER_OF_ATS; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "ATS process append error: invalid ATS index %%d"); /* Execute the function being tested */ - SC_ProcessAppend(AtsIndex); + UtAssert_VOIDCALL(SC_ProcessAppend(AtsIndex)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_PROCESS_APPEND_INV_INDEX_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_VerifyAtsTable_Test_Nominal(void) @@ -1896,20 +1280,7 @@ void SC_VerifyAtsTable_Test_Nominal(void) SC_AtsEntryHeader_t *Entry1; SC_AtsEntryHeader_t *Entry2; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - memset(&AtsTable, 0, sizeof(AtsTable)); - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Verify ATS Table: command count = %%d, byte count = %%d"); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; Entry1 = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; Entry1->CmdNumber = 1; @@ -1923,7 +1294,7 @@ void SC_VerifyAtsTable_Test_Nominal(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_VerifyAtsTable((SC_OperData.AtsTblAddr[AtsIndex]), SC_ATS_BUFF_SIZE); + UtAssert_INT32_EQ(SC_VerifyAtsTable((SC_OperData.AtsTblAddr[AtsIndex]), SC_ATS_BUFF_SIZE), CFE_SUCCESS); /* Verify results */ @@ -1940,19 +1311,8 @@ void SC_VerifyAtsTable_Test_Nominal(void) UtAssert_True(SC_OperData.AtsDupTestArray[SC_MAX_ATS_CMDS - 1] == SC_DUP_TEST_UNUSED, "SC_OperData.AtsDupTestArray[SC_MAX_ATS_CMDS - 1] == SC_DUP_TEST_UNUSED"); - UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_VERIFY_ATS_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_VerifyAtsTable_Test_InvalidEntry(void) @@ -1960,12 +1320,6 @@ void SC_VerifyAtsTable_Test_InvalidEntry(void) SC_AtsEntryHeader_t *Entry1; SC_AtsEntryHeader_t *Entry2; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - - SC_InitTables(); - - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; Entry1 = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; Entry1->CmdNumber = 5000; @@ -1974,66 +1328,37 @@ void SC_VerifyAtsTable_Test_InvalidEntry(void) Entry2->CmdNumber = 0; /* Execute the function being tested */ - Result = SC_VerifyAtsTable((SC_OperData.AtsTblAddr[AtsIndex]), SC_ATS_BUFF_SIZE); + UtAssert_INT32_EQ(SC_VerifyAtsTable((SC_OperData.AtsTblAddr[AtsIndex]), SC_ATS_BUFF_SIZE), SC_ERROR); /* Verify results */ - UtAssert_True(Result == SC_ERROR, "Result == SC_ERROR"); - - 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); + UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_VERIFY_ATS_NUM_ERR_EID); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_VerifyAtsTable_Test_EmptyTable(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Verify ATS Table error: table is empty"); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; - Entry->CmdNumber = 0; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; + Entry->CmdNumber = 0; /* Execute the function being tested */ - Result = SC_VerifyAtsTable((SC_OperData.AtsTblAddr[AtsIndex]), SC_ATS_BUFF_SIZE); + UtAssert_INT32_EQ(SC_VerifyAtsTable((SC_OperData.AtsTblAddr[AtsIndex]), SC_ATS_BUFF_SIZE), SC_ERROR); /* Verify results */ - UtAssert_True(Result == SC_ERROR, "Result == SC_ERROR"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_VERIFY_ATS_MPT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_VerifyAtsEntry_Test_Nominal(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; size_t MsgSize; - SC_InitTables(); - - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; - Entry->CmdNumber = 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; + Entry->CmdNumber = 1; SC_OperData.AtsDupTestArray[0] = SC_DUP_TEST_UNUSED; @@ -2042,130 +1367,66 @@ void SC_VerifyAtsEntry_Test_Nominal(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, SC_ATS_BUFF_SIZE); + UtAssert_INT32_EQ(SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, SC_ATS_BUFF_SIZE), + SC_ATS_HDR_NOPKT_WORDS + ((SC_PACKET_MAX_SIZE + SC_ROUND_UP_BYTES) / SC_BYTES_IN_WORD)); /* Verify results */ - UtAssert_True(Result == SC_ATS_HDR_NOPKT_WORDS + ((SC_PACKET_MAX_SIZE + SC_ROUND_UP_BYTES) / SC_BYTES_IN_WORD), - "Result == SC_ATS_HDR_NOPKT_WORDS + (SC_PACKET_MAX_SIZE + SC_ROUND_UP_BYTES) / SC_BYTES_IN_WORD"); UtAssert_True(SC_OperData.AtsDupTestArray[0] == 0, "SC_OperData.AtsDupTestArray[0] == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_VerifyAtsEntry_Test_EndOfBuffer(void) { uint16 AtsIndex = 10000; - int16 Result; - - SC_InitTables(); /* Execute the function being tested */ - Result = SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[0]), AtsIndex, SC_ATS_BUFF_SIZE); + UtAssert_INT32_EQ(SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[0]), AtsIndex, SC_ATS_BUFF_SIZE), CFE_SUCCESS); /* Verify results */ - UtAssert_True(Result == CFE_SUCCESS, "Result == CFE_SUCCESS"); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_VerifyAtsEntry_Test_InvalidCmdNumber(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Verify ATS Table error: invalid command number: buf index = %%d, cmd num = %%d"); - SC_InitTables(); - - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; - Entry->CmdNumber = 5000; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; + Entry->CmdNumber = 5000; /* Execute the function being tested */ - Result = SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, SC_ATS_BUFF_SIZE); + UtAssert_INT32_EQ(SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, SC_ATS_BUFF_SIZE), SC_ERROR); /* Verify results */ - UtAssert_True(Result == SC_ERROR, "Result == SC_ERROR"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_VERIFY_ATS_NUM_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_VerifyAtsEntry_Test_BufferFull(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Verify ATS Table error: buffer full: buf index = %%d, cmd num = %%d, buf words = %%d"); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; - Entry->CmdNumber = 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; + Entry->CmdNumber = 1; /* Execute the function being tested */ - Result = SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, 2); + UtAssert_INT32_EQ(SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, 2), SC_ERROR); /* Verify results */ - UtAssert_True(Result == SC_ERROR, "Result == SC_ERROR"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_VERIFY_ATS_END_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_VerifyAtsEntry_Test_InvalidCmdLengthTooLow(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Verify ATS Table error: invalid length: buf index = %%d, cmd num = %%d, pkt len = %%d"); - SC_InitTables(); - - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; - Entry->CmdNumber = 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; + Entry->CmdNumber = 1; /* Set to generate error message SC_VERIFY_ATS_PKT_ERR_EID by satisfying condition "(CommandBytes < * SC_PACKET_MIN_SIZE)" */ @@ -2173,42 +1434,21 @@ void SC_VerifyAtsEntry_Test_InvalidCmdLengthTooLow(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, SC_ATS_BUFF_SIZE); + UtAssert_INT32_EQ(SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, SC_ATS_BUFF_SIZE), SC_ERROR); /* Verify results */ - UtAssert_True(Result == SC_ERROR, "Result == SC_ERROR"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_VERIFY_ATS_PKT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_VerifyAtsEntry_Test_InvalidCmdLengthTooHigh(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Verify ATS Table error: invalid length: buf index = %%d, cmd num = %%d, pkt len = %%d"); - - SC_InitTables(); - - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; - Entry->CmdNumber = 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; + Entry->CmdNumber = 1; /* Set to generate error message SC_VERIFY_ATS_PKT_ERR_EID by satisfying condition "(CommandBytes < * SC_PACKET_MIN_SIZE)" */ @@ -2216,84 +1456,42 @@ void SC_VerifyAtsEntry_Test_InvalidCmdLengthTooHigh(void) UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, SC_ATS_BUFF_SIZE); + UtAssert_INT32_EQ(SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, SC_ATS_BUFF_SIZE), SC_ERROR); /* Verify results */ - UtAssert_True(Result == SC_ERROR, "Result == SC_ERROR"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_VERIFY_ATS_PKT_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_VerifyAtsEntry_Test_BufferOverflow(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Verify ATS Table error: buffer overflow: buf index = %%d, cmd num = %%d, pkt len = %%d"); - SC_InitTables(); - - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; - Entry->CmdNumber = 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; + Entry->CmdNumber = 1; /* Set to generate error message SC_VERIFY_ATS_BUF_ERR_EID */ MsgSize = SC_PACKET_MAX_SIZE; UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, 20); + UtAssert_INT32_EQ(SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, 20), SC_ERROR); /* Verify results */ - UtAssert_True(Result == SC_ERROR, "Result == SC_ERROR"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_VERIFY_ATS_BUF_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_VerifyAtsEntry_Test_DuplicateCmdNumber(void) { SC_AtsEntryHeader_t *Entry; uint8 AtsIndex = 0; - int16 Result; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Verify ATS Table error: dup cmd number: buf index = %%d, cmd num = %%d, dup index = %%d"); - - SC_InitTables(); - SC_OperData.AtsTblAddr[AtsIndex] = &AtsTable[0]; - Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; - Entry->CmdNumber = 1; + Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[AtsIndex][0]; + Entry->CmdNumber = 1; /* Set to generate error message SC_VERIFY_ATS_DUP_ERR_EID */ MsgSize = SC_PACKET_MAX_SIZE; @@ -2302,22 +1500,11 @@ void SC_VerifyAtsEntry_Test_DuplicateCmdNumber(void) SC_OperData.AtsDupTestArray[0] = 99; /* Execute the function being tested */ - Result = SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, SC_ATS_BUFF_SIZE); + UtAssert_INT32_EQ(SC_VerifyAtsEntry((SC_OperData.AtsTblAddr[AtsIndex]), AtsIndex, SC_ATS_BUFF_SIZE), SC_ERROR); /* Verify results */ - UtAssert_True(Result == SC_ERROR, "Result == SC_ERROR"); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_VERIFY_ATS_DUP_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void UtTest_Setup(void) diff --git a/unit-test/sc_rtsrq_tests.c b/unit-test/sc_rtsrq_tests.c index 8836820..7074343 100644 --- a/unit-test/sc_rtsrq_tests.c +++ b/unit-test/sc_rtsrq_tests.c @@ -40,9 +40,6 @@ #include "utassert.h" #include "utstubs.h" -/* sc_rtsrq_tests globals */ -uint8 call_count_CFE_EVS_SendEvent; - /* * Function Definitions */ @@ -51,19 +48,7 @@ void SC_StartRtsCmd_Test_Nominal(void) { SC_RtsEntryHeader_t *Entry; uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS Number %%03d Started"); - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; Entry->TimeTag = 0; @@ -81,7 +66,7 @@ void SC_StartRtsCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus == SC_EXECUTING, @@ -98,38 +83,19 @@ void SC_StartRtsCmd_Test_Nominal(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_START_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsCmd_Test_StartRtsNoEvents(void) { SC_RtsEntryHeader_t *Entry; uint8 RtsIndex; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; size_t MsgSize; - SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = SC_NUMBER_OF_RTS; RtsIndex = UT_CmdBuf.RtsCmd.RtsId - 1; - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - memset(&RtsTable, 0, sizeof(RtsTable)); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; - Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; Entry->TimeTag = 0; @@ -145,7 +111,7 @@ void SC_StartRtsCmd_Test_StartRtsNoEvents(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus == SC_EXECUTING, @@ -165,12 +131,10 @@ void SC_StartRtsCmd_Test_StartRtsNoEvents(void) if (UT_CmdBuf.RtsCmd.RtsId > SC_LAST_RTS_WITH_EVENTS) { UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTS_CMD_DBG_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); } else { UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_START_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); } UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); @@ -180,20 +144,7 @@ void SC_StartRtsCmd_Test_InvalidCommandLength1(void) { SC_RtsEntryHeader_t *Entry; uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Start RTS %%03d Rejected: Invld Len Field for 1st Cmd in Sequence. Invld Cmd Length = %%d"); - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; Entry->TimeTag = 0; @@ -211,40 +162,18 @@ void SC_StartRtsCmd_Test_InvalidCommandLength1(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTS_CMD_INVLD_LEN_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsCmd_Test_InvalidCommandLength2(void) { SC_RtsEntryHeader_t *Entry; uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Start RTS %%03d Rejected: Invld Len Field for 1st Cmd in Sequence. Invld Cmd Length = %%d"); - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; Entry->TimeTag = 0; @@ -262,39 +191,17 @@ void SC_StartRtsCmd_Test_InvalidCommandLength2(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTS_CMD_INVLD_LEN_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsCmd_Test_RtsNotLoadedOrInUse(void) { SC_RtsEntryHeader_t *Entry; uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Start RTS %%03d Rejected: RTS Not Loaded or In Use, Status: %%d"); - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; Entry->TimeTag = 0; @@ -309,36 +216,17 @@ void SC_StartRtsCmd_Test_RtsNotLoadedOrInUse(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTS_CMD_NOT_LDED_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsCmd_Test_RtsDisabled(void) { SC_RtsEntryHeader_t *Entry; uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start RTS %%03d Rejected: RTS Disabled"); - - SC_InitTables(); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; Entry = (SC_RtsEntryHeader_t *)&SC_OperData.RtsTblAddr[RtsIndex][0]; Entry->TimeTag = 0; @@ -353,30 +241,15 @@ void SC_StartRtsCmd_Test_RtsDisabled(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTS_CMD_DISABLED_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsCmd_Test_InvalidRtsId(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start RTS %%03d Rejected: Invalid RTS ID"); - - SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = SC_NUMBER_OF_RTS * 2; /* Set message size in order to satisfy if-statement after comment "Make sure the command is big enough, but not too @@ -384,30 +257,15 @@ void SC_StartRtsCmd_Test_InvalidRtsId(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTS_CMD_INVALID_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsCmd_Test_InvalidRtsIdZero(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start RTS %%03d Rejected: Invalid RTS ID"); - - SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = 0; /* Set message size in order to satisfy if-statement after comment "Make sure the command is big enough, but not too @@ -415,53 +273,28 @@ void SC_StartRtsCmd_Test_InvalidRtsIdZero(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTS_CMD_INVALID_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsCmd_Test_NoVerifyLength(void) { /* Execute the function being tested */ - SC_StartRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.RtsActiveErrCtr == 1, "SC_OperData.HkPacket.RtsActiveErrCtr == 1"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_StartRtsGrpCmd_Test_Nominal(void) { - uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Start RTS group: FirstID=%%d, LastID=%%d, Modified=%%d"); - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - memset(&RtsTable, 0, sizeof(RtsTable)); + uint8 RtsIndex = 0; - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_LOADED; SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr = 0; @@ -472,7 +305,7 @@ void SC_StartRtsGrpCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus == SC_EXECUTING, @@ -489,26 +322,11 @@ void SC_StartRtsGrpCmd_Test_Nominal(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsGrpCmd_Test_StartRtsGroupError(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS * 2; UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS * 2; @@ -516,45 +334,26 @@ void SC_StartRtsGrpCmd_Test_StartRtsGroupError(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsGrpCmd_Test_NoVerifyLength(void) { /* Execute the function being tested */ - SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_StartRtsGrpCmd_Test_FirstRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS + 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -562,32 +361,17 @@ void SC_StartRtsGrpCmd_Test_FirstRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsGrpCmd_Test_FirstRtsIndexZero(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 0; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -595,33 +379,17 @@ void SC_StartRtsGrpCmd_Test_FirstRtsIndexZero(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsGrpCmd_Test_LastRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS + 1; @@ -629,32 +397,17 @@ void SC_StartRtsGrpCmd_Test_LastRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsGrpCmd_Test_LastRtsIndexZero(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = 0; @@ -662,33 +415,17 @@ void SC_StartRtsGrpCmd_Test_LastRtsIndexZero(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsGrpCmd_Test_FirstLastRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Start RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 2; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -696,43 +433,18 @@ void SC_StartRtsGrpCmd_Test_FirstLastRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StartRtsGrpCmd_Test_DisabledFlag(void) { - uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Start RTS group error: rejected RTS ID %%03d, RTS Disabled"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Start RTS group: FirstID=%%d, LastID=%%d, Modified=%%d"); - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - memset(&RtsTable, 0, sizeof(RtsTable)); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + uint8 RtsIndex = 0; SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = true; SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_EXECUTING; @@ -747,7 +459,7 @@ void SC_StartRtsGrpCmd_Test_DisabledFlag(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].CmdCtr == 0, "SC_OperData.RtsInfoTblAddr[RtsIndex].CmdCtr == 0"); @@ -763,46 +475,13 @@ void SC_StartRtsGrpCmd_Test_DisabledFlag(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_DISABLED_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_STARTRTSGRP_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = - strncmp(ExpectedEventString[1], context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_StartRtsGrpCmd_Test_RtsStatus(void) { - uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Start RTS group error: rejected RTS ID %%03d, RTS Not Loaded or In Use, Status: %%d"); - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Start RTS group: FirstID=%%d, LastID=%%d, Modified=%%d"); - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - memset(&RtsTable, 0, sizeof(RtsTable)); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + uint8 RtsIndex = 0; SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_EXECUTING; SC_OperData.RtsInfoTblAddr[RtsIndex].UseCtr = 0; @@ -816,7 +495,7 @@ void SC_StartRtsGrpCmd_Test_RtsStatus(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StartRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StartRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus == SC_EXECUTING, @@ -834,112 +513,55 @@ void SC_StartRtsGrpCmd_Test_RtsStatus(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STARTRTSGRP_CMD_NOT_LDED_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = - strncmp(ExpectedEventString[0], context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, SC_STARTRTSGRP_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = - strncmp(ExpectedEventString[1], context_CFE_EVS_SendEvent[1].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[1].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void SC_StopRtsCmd_Test_Nominal(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS %%03d Aborted"); - - SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = 1; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StopRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTS_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopRtsCmd_Test_InvalidRts(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Stop RTS %%03d rejected: Invalid RTS ID"); - - SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = SC_NUMBER_OF_RTS * 2; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StopRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTS_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopRtsCmd_Test_NoVerifyLength(void) { /* Execute the function being tested */ - SC_StopRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_StopRtsGrpCmd_Test_Nominal(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Stop RTS group: FirstID=%%d, LastID=%%d, Modified=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -947,32 +569,17 @@ void SC_StopRtsGrpCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopRtsGrpCmd_Test_Error(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Stop RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS * 2; UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS * 2; @@ -980,53 +587,27 @@ void SC_StopRtsGrpCmd_Test_Error(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopRtsGrpCmd_Test_NoVerifyLength(void) { /* Execute the function being tested */ - SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_StopRtsGrpCmd_Test_NotExecuting(void) { - uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Stop RTS group: FirstID=%%d, LastID=%%d, Modified=%%d"); - - memset(&RtsTable, 0, sizeof(RtsTable)); - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_InitTables(); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + uint8 RtsIndex = 0; SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_EXECUTING; @@ -1037,32 +618,17 @@ void SC_StopRtsGrpCmd_Test_NotExecuting(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopRtsGrpCmd_Test_FirstRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Stop RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS + 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -1070,32 +636,17 @@ void SC_StopRtsGrpCmd_Test_FirstRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopRtsGrpCmd_Test_FirstRtsIndexZero(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Stop RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 0; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -1103,32 +654,17 @@ void SC_StopRtsGrpCmd_Test_FirstRtsIndexZero(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopRtsGrpCmd_Test_LastRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Stop RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS + 1; @@ -1136,32 +672,17 @@ void SC_StopRtsGrpCmd_Test_LastRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopRtsGrpCmd_Test_LastRtsIndexZero(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Stop RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = 0; @@ -1169,32 +690,17 @@ void SC_StopRtsGrpCmd_Test_LastRtsIndexZero(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_StopRtsGrpCmd_Test_FirstLastRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Stop RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 2; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -1202,32 +708,18 @@ void SC_StopRtsGrpCmd_Test_FirstLastRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_StopRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_StopRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_STOPRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_DisableRtsCmd_Test_Nominal(void) { uint8 RtsIndex = 0; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Disabled RTS %%03d"); - - SC_InitTables(); UT_CmdBuf.RtsCmd.RtsId = 1; @@ -1235,7 +727,7 @@ void SC_DisableRtsCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_DisableRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == true, @@ -1243,71 +735,38 @@ void SC_DisableRtsCmd_Test_Nominal(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISABLE_RTS_DEB_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_DisableRtsCmd_Test_InvalidRtsID(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Disable RTS %%03d Rejected: Invalid RTS ID"); - - SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = SC_NUMBER_OF_RTS * 2; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_DisableRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTS_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_DisableRtsCmd_Test_NoVerifyLength(void) { /* Execute the function being tested */ - SC_DisableRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_DisableRtsGrpCmd_Test_Nominal(void) { uint8 RtsIndex = 0; /* RtsId - 1 */ - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Disable RTS group: FirstID=%%d, LastID=%%d, Modified=%%d"); - - SC_InitTables(); UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -1316,7 +775,7 @@ void SC_DisableRtsGrpCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == true, @@ -1324,27 +783,11 @@ void SC_DisableRtsGrpCmd_Test_Nominal(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_DisableRtsGrpCmd_Test_Error(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Disable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS * 2; UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS * 2; @@ -1352,45 +795,26 @@ void SC_DisableRtsGrpCmd_Test_Error(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_DisableRtsGrpCmd_Test_NoVerifyLength(void) { /* Execute the function being tested */ - SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_DisableRtsGrpCmd_Test_FirstRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Disable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS + 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -1398,33 +822,17 @@ void SC_DisableRtsGrpCmd_Test_FirstRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_DisableRtsGrpCmd_Test_FirstRtsIndexZero(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Disable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 0; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -1432,33 +840,17 @@ void SC_DisableRtsGrpCmd_Test_FirstRtsIndexZero(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_DisableRtsGrpCmd_Test_LastRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Disable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS + 1; @@ -1466,33 +858,17 @@ void SC_DisableRtsGrpCmd_Test_LastRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_DisableRtsGrpCmd_Test_LastRtsIndexZero(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Disable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = 0; @@ -1500,33 +876,17 @@ void SC_DisableRtsGrpCmd_Test_LastRtsIndexZero(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_DisableRtsGrpCmd_Test_FirstLastRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Disable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 2; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -1534,33 +894,18 @@ void SC_DisableRtsGrpCmd_Test_FirstLastRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_DisableRtsGrpCmd_Test_DisabledFlag(void) { uint8 RtsIndex = 0; /* RtsId - 1 */ - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Disable RTS group: FirstID=%%d, LastID=%%d, Modified=%%d"); - - SC_InitTables(); SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = true; @@ -1571,7 +916,7 @@ void SC_DisableRtsGrpCmd_Test_DisabledFlag(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_DisableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == true, @@ -1579,26 +924,12 @@ void SC_DisableRtsGrpCmd_Test_DisabledFlag(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_DISRTSGRP_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_EnableRtsCmd_Test_Nominal(void) { uint8 RtsIndex = 0; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Enabled RTS %%03d"); - - SC_InitTables(); UT_CmdBuf.RtsCmd.RtsId = 1; @@ -1606,7 +937,7 @@ void SC_EnableRtsCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_EnableRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == false, @@ -1614,104 +945,55 @@ void SC_EnableRtsCmd_Test_Nominal(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENABLE_RTS_DEB_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_DEBUG); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_EnableRtsCmd_Test_InvalidRtsID(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Enable RTS %%03d Rejected: Invalid RTS ID"); - - SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = SC_NUMBER_OF_RTS * 2; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_EnableRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTS_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_EnableRtsCmd_Test_InvalidRtsIDZero(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "Enable RTS %%03d Rejected: Invalid RTS ID"); - - SC_InitTables(); - UT_CmdBuf.RtsCmd.RtsId = 0; /* Set message size so SC_VerifyCmdLength will return true, to satisfy first if-statement */ UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_EnableRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTS_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_EnableRtsCmd_Test_NoVerifyLength(void) { /* Execute the function being tested */ - SC_EnableRtsCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsCmd(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_EnableRtsGrpCmd_Test_Nominal(void) { uint8 RtsIndex = 0; /* RtsId - 1 */ - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Enable RTS group: FirstID=%%d, LastID=%%d, Modified=%%d"); - - SC_InitTables(); UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -1720,7 +1002,7 @@ void SC_EnableRtsGrpCmd_Test_Nominal(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == false, @@ -1728,27 +1010,11 @@ void SC_EnableRtsGrpCmd_Test_Nominal(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_EnableRtsGrpCmd_Test_Error(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Enable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS * 2; UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS * 2; @@ -1756,45 +1022,26 @@ void SC_EnableRtsGrpCmd_Test_Error(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_EnableRtsGrpCmd_Test_NoVerifyLength(void) { /* Execute the function being tested */ - SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_EnableRtsGrpCmd_Test_FirstRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Enable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = SC_NUMBER_OF_RTS + 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -1802,33 +1049,17 @@ void SC_EnableRtsGrpCmd_Test_FirstRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_EnableRtsGrpCmd_Test_FirstRtsIndexZero(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Enable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 0; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -1836,33 +1067,17 @@ void SC_EnableRtsGrpCmd_Test_FirstRtsIndexZero(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_EnableRtsGrpCmd_Test_LastRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Enable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = SC_NUMBER_OF_RTS + 1; @@ -1870,33 +1085,17 @@ void SC_EnableRtsGrpCmd_Test_LastRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_EnableRtsGrpCmd_Test_LastRtsIndexZero(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Enable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 1; UT_CmdBuf.RtsGrpCmd.LastRtsId = 0; @@ -1904,33 +1103,17 @@ void SC_EnableRtsGrpCmd_Test_LastRtsIndexZero(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_EnableRtsGrpCmd_Test_FirstLastRtsIndex(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Enable RTS group error: FirstID=%%d, LastID=%%d"); - - SC_InitTables(); - UT_CmdBuf.RtsGrpCmd.FirstRtsId = 2; UT_CmdBuf.RtsGrpCmd.LastRtsId = 1; @@ -1938,33 +1121,18 @@ void SC_EnableRtsGrpCmd_Test_FirstLastRtsIndex(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_EnableRtsGrpCmd_Test_DisabledFlag(void) { uint8 RtsIndex = 0; /* RtsId - 1 */ - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Enable RTS group: FirstID=%%d, LastID=%%d, Modified=%%d"); - - SC_InitTables(); SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag = false; SC_OperData.RtsInfoTblAddr[1].DisabledFlag = true; @@ -1975,7 +1143,7 @@ void SC_EnableRtsGrpCmd_Test_DisabledFlag(void) UT_SetDeferredRetcode(UT_KEY(SC_VerifyCmdLength), 1, true); /* Execute the function being tested */ - SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf); + UtAssert_VOIDCALL(SC_EnableRtsGrpCmd(&UT_CmdBuf.Buf)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].DisabledFlag == false, @@ -1983,36 +1151,18 @@ void SC_EnableRtsGrpCmd_Test_DisabledFlag(void) UtAssert_True(SC_OperData.HkPacket.CmdCtr == 1, "SC_OperData.HkPacket.CmdCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ENARTSGRP_CMD_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_KillRts_Test(void) { - uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + uint8 RtsIndex = 0; SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_EXECUTING; SC_OperData.RtsCtrlBlckAddr->NumRtsActive = 1; /* Execute the function being tested */ - SC_KillRts(RtsIndex); + UtAssert_VOIDCALL(SC_KillRts(RtsIndex)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus == SC_LOADED, @@ -2021,30 +1171,18 @@ void SC_KillRts_Test(void) "SC_OperData.RtsInfoTblAddr[RtsIndex].NextCommandTime == SC_MAX_TIME"); UtAssert_True(SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 0, "SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_KillRts_Test_NoActiveRts(void) { - uint8 RtsIndex = 0; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; - SC_RtpControlBlock_t RtsCtrlBlck; - - SC_InitTables(); - - memset(&RtsCtrlBlck, 0, sizeof(RtsCtrlBlck)); - - SC_OperData.RtsTblAddr[RtsIndex] = &RtsTable[0]; - SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlck; + uint8 RtsIndex = 0; SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus = SC_EXECUTING; SC_OperData.RtsCtrlBlckAddr->NumRtsActive = 0; /* Execute the function being tested */ - SC_KillRts(RtsIndex); + UtAssert_VOIDCALL(SC_KillRts(RtsIndex)); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[RtsIndex].RtsStatus == SC_LOADED, @@ -2053,35 +1191,19 @@ void SC_KillRts_Test_NoActiveRts(void) "SC_OperData.RtsInfoTblAddr[RtsIndex].NextCommandTime == SC_MAX_TIME"); UtAssert_True(SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 0, "SC_OperData.RtsCtrlBlckAddr->NumRtsActive == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_KillRts_Test_InvalidIndex(void) { uint8 RtsIndex = SC_NUMBER_OF_RTS; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS kill error: invalid RTS index %%d"); /* Execute the function being tested */ - SC_KillRts(RtsIndex); + UtAssert_VOIDCALL(SC_KillRts(RtsIndex)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_KILLRTS_INV_INDEX_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AutoStartRts_Test_Nominal(void) @@ -2089,63 +1211,34 @@ void SC_AutoStartRts_Test_Nominal(void) uint8 RtsId = 1; /* Execute the function being tested */ - SC_AutoStartRts(RtsId); + UtAssert_VOIDCALL(SC_AutoStartRts(RtsId)); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_AutoStartRts_Test_InvalidId(void) { uint8 RtsId = SC_NUMBER_OF_RTS + 1; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS autostart error: invalid RTS ID %%d"); /* Execute the function being tested */ - SC_AutoStartRts(RtsId); + UtAssert_VOIDCALL(SC_AutoStartRts(RtsId)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_AUTOSTART_RTS_INV_ID_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_AutoStartRts_Test_InvalidIdZero(void) { uint8 RtsId = 0; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS autostart error: invalid RTS ID %%d"); /* Execute the function being tested */ - SC_AutoStartRts(RtsId); + UtAssert_VOIDCALL(SC_AutoStartRts(RtsId)); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_AUTOSTART_RTS_INV_ID_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void UtTest_Setup(void) diff --git a/unit-test/sc_state_tests.c b/unit-test/sc_state_tests.c index 2270b0a..aa0d1d1 100644 --- a/unit-test/sc_state_tests.c +++ b/unit-test/sc_state_tests.c @@ -40,19 +40,6 @@ #include "utassert.h" #include "utstubs.h" -/* sc_state_tests globals */ -uint8 call_count_CFE_EVS_SendEvent; - -uint32 SC_ATSRQ_TEST_GlobalAtsCmdStatus[SC_NUMBER_OF_ATS]; - -SC_AtsInfoTable_t SC_ATSRQ_TEST_GlobalAtsInfoTable[2]; - -SC_AtpControlBlock_t SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - -SC_RtsInfoEntry_t SC_STATE_TEST_GlobalRtsInfoTbl[SC_NUMBER_OF_RTS]; - -SC_RtpControlBlock_t SC_STATE_TEST_GlobalRtsCtrlBlck; - /* * Function Definitions */ @@ -70,77 +57,41 @@ int32 SC_STATE_TEST_CFE_SB_GetTotalMsgLengthHook(void *UserObj, int32 StubRetcod void SC_GetNextRtsTime_Test_Nominal(void) { - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - SC_OperData.RtsInfoTblAddr[0].RtsStatus = SC_EXECUTING; SC_OperData.RtsInfoTblAddr[0].NextCommandTime = SC_MAX_TIME; /* Execute the function being tested */ - SC_GetNextRtsTime(); + UtAssert_VOIDCALL(SC_GetNextRtsTime()); /* Verify results */ UtAssert_True(SC_OperData.RtsCtrlBlckAddr->RtsNumber == 1, "SC_OperData.RtsCtrlBlckAddr->RtsNumber == 1"); UtAssert_True(SC_AppData.NextCmdTime[1] == SC_MAX_TIME, "SC_AppData.NextCmdTime[1] == SC_MAX_TIME"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetNextRtsTime_Test_InvalidRtsNumber(void) { uint8 i; - SC_InitTables(); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - for (i = 0; i < SC_NUMBER_OF_RTS; i++) { SC_OperData.RtsInfoTblAddr[i].RtsStatus = -1; } /* Execute the function being tested */ - SC_GetNextRtsTime(); + UtAssert_VOIDCALL(SC_GetNextRtsTime()); /* Verify results */ UtAssert_True(SC_OperData.RtsCtrlBlckAddr->RtsNumber == SC_INVALID_RTS_NUMBER, "SC_OperData.RtsCtrlBlckAddr->RtsNumber == SC_INVALID_RTS_NUMBER"); UtAssert_True(SC_AppData.NextCmdTime[SC_RTP] == SC_MAX_TIME, "SC_AppData.NextCmdTime[SC_RTP] == SC_MAX_TIME"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetNextRtsTime_Test_RtsPriority(void) { - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - SC_OperData.RtsInfoTblAddr[0].RtsStatus = SC_EXECUTING; SC_OperData.RtsInfoTblAddr[0].NextCommandTime = SC_MAX_TIME; @@ -148,97 +99,46 @@ void SC_GetNextRtsTime_Test_RtsPriority(void) SC_OperData.RtsInfoTblAddr[1].NextCommandTime = SC_MAX_TIME - 1; /* Execute the function being tested */ - SC_GetNextRtsTime(); + UtAssert_VOIDCALL(SC_GetNextRtsTime()); /* Verify results */ UtAssert_True(SC_OperData.RtsCtrlBlckAddr->RtsNumber == 2, "SC_OperData.RtsCtrlBlckAddr->RtsNumber == 2 "); UtAssert_True(SC_AppData.NextCmdTime[1] == SC_MAX_TIME - 1, "SC_AppData.NextCmdTime[1] == SC_MAX_TIME - 1"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_UpdateNextTime_Test_Atp(void) { - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; /* Execute the function being tested */ - SC_UpdateNextTime(); + UtAssert_VOIDCALL(SC_UpdateNextTime()); /* Verify results */ UtAssert_True(SC_AppData.NextProcNumber == SC_ATP, "SC_AppData.NextProcNumber == SC_ATP"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_UpdateNextTime_Test_Atp2(void) { - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - SC_OperData.AtsCtrlBlckAddr->AtpState = SC_EXECUTING; SC_OperData.RtsCtrlBlckAddr->RtsNumber = SC_NUMBER_OF_RTS + 1; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.NextCmdTime[SC_ATP] = 10; /* Execute the function being tested */ - SC_UpdateNextTime(); + UtAssert_VOIDCALL(SC_UpdateNextTime()); /* Verify results */ UtAssert_True(SC_AppData.NextProcNumber == SC_ATP, "SC_AppData.NextProcNumber == SC_ATP"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_UpdateNextTime_Test_Rtp(void) { - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - SC_OperData.RtsCtrlBlckAddr->RtsNumber = 10; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.NextCmdTime[SC_ATP] = 10; @@ -247,33 +147,16 @@ void SC_UpdateNextTime_Test_Rtp(void) SC_OperData.RtsInfoTblAddr[0].NextCommandTime = 1; /* Execute the function being tested */ - SC_UpdateNextTime(); + UtAssert_VOIDCALL(SC_UpdateNextTime()); /* Verify results */ UtAssert_True(SC_AppData.NextProcNumber == SC_RTP, "SC_AppData.NextProcNumber == SC_RTP"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_UpdateNextTime_Test_RtpAtpPriority(void) { - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - SC_OperData.RtsCtrlBlckAddr->RtsNumber = 0; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.NextCmdTime[SC_ATP] = 0; @@ -282,37 +165,17 @@ void SC_UpdateNextTime_Test_RtpAtpPriority(void) SC_OperData.RtsInfoTblAddr[SC_NUMBER_OF_RTS - 1].NextCommandTime = 1; /* Execute the function being tested */ - SC_UpdateNextTime(); + UtAssert_VOIDCALL(SC_UpdateNextTime()); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetNextRtsCommand_Test_GetNextCommand(void) { SC_RtsEntryHeader_t *Entry; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; size_t MsgSize; - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; - SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; SC_AppData.NextProcNumber = SC_RTP; @@ -334,7 +197,7 @@ void SC_GetNextRtsCommand_Test_GetNextCommand(void) UT_SetDeferredRetcode(UT_KEY(CFE_MSG_ValidateChecksum), 1, true); /* Execute the function being tested */ - SC_GetNextRtsCommand(); + UtAssert_VOIDCALL(SC_GetNextRtsCommand()); /* Verify results */ UtAssert_True(SC_OperData.RtsInfoTblAddr[0].NextCommandPtr == @@ -342,20 +205,13 @@ void SC_GetNextRtsCommand_Test_GetNextCommand(void) "SC_OperData.RtsInfoTblAddr[0].NextCommandPtr == (SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE + 1) / " "SC_BYTES_IN_WORD"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetNextRtsCommand_Test_RtsNumberZero(void) { - /* Sets SC_OperData.RtsCtrlBlckAddr->RtsNumber to zero */ - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - /* Execute the function being tested */ - SC_GetNextRtsCommand(); + UtAssert_VOIDCALL(SC_GetNextRtsCommand()); /* Verify results */ UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); @@ -364,25 +220,8 @@ void SC_GetNextRtsCommand_Test_RtsNumberZero(void) void SC_GetNextRtsCommand_Test_RtsNumberMax(void) { SC_RtsEntryHeader_t *Entry; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; size_t MsgSize; - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.RtsTblAddr[SC_NUMBER_OF_RTS - 1] = &RtsTable[0]; - SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; SC_AppData.NextProcNumber = SC_RTP; @@ -404,37 +243,17 @@ void SC_GetNextRtsCommand_Test_RtsNumberMax(void) UT_SetDeferredRetcode(UT_KEY(CFE_MSG_ValidateChecksum), 1, true); /* Execute the function being tested */ - SC_GetNextRtsCommand(); + UtAssert_VOIDCALL(SC_GetNextRtsCommand()); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetNextRtsCommand_Test_RtsNumberOverMax(void) { SC_RtsEntryHeader_t *Entry; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; size_t MsgSize; - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.RtsTblAddr[SC_NUMBER_OF_RTS - 1] = &RtsTable[0]; - SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; SC_AppData.NextProcNumber = SC_RTP; @@ -455,37 +274,17 @@ void SC_GetNextRtsCommand_Test_RtsNumberOverMax(void) UT_SetDeferredRetcode(UT_KEY(CFE_MSG_ValidateChecksum), 1, true); /* Execute the function being tested */ - SC_GetNextRtsCommand(); + UtAssert_VOIDCALL(SC_GetNextRtsCommand()); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetNextRtsCommand_Test_RtsNotExecuting(void) { SC_RtsEntryHeader_t *Entry; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; size_t MsgSize; - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.RtsTblAddr[SC_NUMBER_OF_RTS - 1] = &RtsTable[0]; - SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; SC_AppData.NextProcNumber = SC_RTP; @@ -507,41 +306,17 @@ void SC_GetNextRtsCommand_Test_RtsNotExecuting(void) UT_SetDeferredRetcode(UT_KEY(CFE_MSG_ValidateChecksum), 1, true); /* Execute the function being tested */ - SC_GetNextRtsCommand(); + UtAssert_VOIDCALL(SC_GetNextRtsCommand()); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetNextRtsCommand_Test_RtsLengthError(void) { SC_RtsEntryHeader_t *Entry; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; size_t MsgSize1; size_t MsgSize2; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Cmd Runs passed end of table, RTS %%03d Aborted"); - - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; @@ -568,7 +343,7 @@ void SC_GetNextRtsCommand_Test_RtsLengthError(void) (SC_RTS_BUFF_SIZE32 - (SC_RTS_HDR_WORDS)) - ((SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE + 3) / SC_BYTES_IN_WORD); /* Execute the function being tested */ - SC_GetNextRtsCommand(); + UtAssert_VOIDCALL(SC_GetNextRtsCommand()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.RtsCmdErrCtr == 1, "SC_OperData.HkPacket.RtsCmdErrCtr == 1"); @@ -583,44 +358,14 @@ void SC_GetNextRtsCommand_Test_RtsLengthError(void) "((SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE + 3) / SC_BYTES_IN_WORD)"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_LNGTH_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetNextRtsCommand_Test_CommandLengthError(void) { SC_RtsEntryHeader_t *Entry; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; size_t MsgSize1; size_t MsgSize2; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid Length Field in RTS Command, RTS %%03d Aborted. Length: %%u, Max: %%d"); - - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; @@ -647,7 +392,7 @@ void SC_GetNextRtsCommand_Test_CommandLengthError(void) (SC_RTS_BUFF_SIZE32 - (SC_RTS_HDR_WORDS)) - ((SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE + 3) / SC_BYTES_IN_WORD); /* Execute the function being tested */ - SC_GetNextRtsCommand(); + UtAssert_VOIDCALL(SC_GetNextRtsCommand()); /* Verify results */ UtAssert_True(SC_OperData.HkPacket.RtsCmdErrCtr == 1, "SC_OperData.HkPacket.RtsCmdErrCtr == 1"); @@ -662,43 +407,14 @@ void SC_GetNextRtsCommand_Test_CommandLengthError(void) "((SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE + 3) / SC_BYTES_IN_WORD)"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_CMD_LNGTH_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetNextRtsCommand_Test_ZeroCommandLength(void) { SC_RtsEntryHeader_t *Entry; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; size_t MsgSize1; size_t MsgSize2; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS %%03d Execution Completed"); - - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.RtsTblAddr[SC_LAST_RTS_WITH_EVENTS - 1] = &RtsTable[0]; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; @@ -726,46 +442,18 @@ void SC_GetNextRtsCommand_Test_ZeroCommandLength(void) 1; /* Execute the function being tested */ - SC_GetNextRtsCommand(); + UtAssert_VOIDCALL(SC_GetNextRtsCommand()); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_COMPL_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetNextRtsCommand_Test_ZeroCommandLengthLastRts(void) { SC_RtsEntryHeader_t *Entry; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; size_t MsgSize1; size_t MsgSize2; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS %%03d Execution Completed"); - - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.RtsTblAddr[SC_LAST_RTS_WITH_EVENTS] = &RtsTable[0]; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; @@ -793,39 +481,16 @@ void SC_GetNextRtsCommand_Test_ZeroCommandLengthLastRts(void) 1; /* Execute the function being tested */ - SC_GetNextRtsCommand(); + UtAssert_VOIDCALL(SC_GetNextRtsCommand()); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetNextRtsCommand_Test_EndOfBuffer(void) { SC_RtsEntryHeader_t *Entry; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; size_t MsgSize; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "RTS %%03d Execution Completed"); - - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.RtsTblAddr[0] = &RtsTable[0]; SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; @@ -851,44 +516,18 @@ void SC_GetNextRtsCommand_Test_EndOfBuffer(void) 1; /* Execute the function being tested */ - SC_GetNextRtsCommand(); + UtAssert_VOIDCALL(SC_GetNextRtsCommand()); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_RTS_COMPL_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetNextRtsCommand_Test_EndOfBufferLastRts(void) { SC_RtsEntryHeader_t *Entry; - uint32 RtsTable[SC_RTS_BUFF_SIZE32]; size_t MsgSize; - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.RtsTblAddr[SC_LAST_RTS_WITH_EVENTS] = &RtsTable[0]; - SC_AppData.NextCmdTime[SC_RTP] = 0; SC_AppData.CurrentTime = 1; SC_AppData.NextProcNumber = SC_RTP; @@ -913,104 +552,47 @@ void SC_GetNextRtsCommand_Test_EndOfBufferLastRts(void) 1; /* Execute the function being tested */ - SC_GetNextRtsCommand(); + UtAssert_VOIDCALL(SC_GetNextRtsCommand()); /* Verify results */ - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetNextAtsCommand_Test_Starting(void) { - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - SC_OperData.AtsCtrlBlckAddr->AtpState = SC_STARTING; /* Execute the function being tested */ /* NOTE: Calling SC_ProcessRtpCommand instead of SC_GetNextRtsCommand - SC_ProcessRtpCommand calls * SC_GetNextRtsCommand, and it's much easier to test this way. */ - SC_GetNextAtsCommand(); + UtAssert_VOIDCALL(SC_GetNextAtsCommand()); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_EXECUTING, "SC_OperData.AtsCtrlBlckAddr -> AtpState == SC_EXECUTING"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetNextAtsCommand_Test_Idle(void) { - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - SC_OperData.AtsCtrlBlckAddr->AtpState = SC_IDLE; /* Execute the function being tested */ /* NOTE: Calling SC_ProcessRtpCommand instead of SC_GetNextRtsCommand - SC_ProcessRtpCommand calls * SC_GetNextRtsCommand, and it's much easier to test this way. */ - SC_GetNextAtsCommand(); + UtAssert_VOIDCALL(SC_GetNextAtsCommand()); /* Verify results */ UtAssert_True(SC_OperData.AtsCtrlBlckAddr->AtpState == SC_IDLE, "SC_OperData.AtsCtrlBlckAddr -> AtpState == SC_IDLE"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_GetNextAtsCommand_Test_GetNextCommand(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -1030,7 +612,7 @@ void SC_GetNextAtsCommand_Test_GetNextCommand(void) SC_OperData.AtsInfoTblAddr[SC_ATP].NumberOfCommands = 100; /* Execute the function being tested */ - SC_GetNextAtsCommand(); + UtAssert_VOIDCALL(SC_GetNextAtsCommand()); /* Verify results */ UtAssert_INT32_EQ(SC_OperData.AtsCtrlBlckAddr->TimeIndexPtr, 1); @@ -1043,29 +625,6 @@ void SC_GetNextAtsCommand_Test_GetNextCommand(void) void SC_GetNextAtsCommand_Test_ExecutionACompleted(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c Execution Completed"); - - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -1084,48 +643,16 @@ void SC_GetNextAtsCommand_Test_ExecutionACompleted(void) SC_OperData.AtsInfoTblAddr[SC_ATP].NumberOfCommands = 0; /* Execute the function being tested */ - SC_GetNextAtsCommand(); + UtAssert_VOIDCALL(SC_GetNextAtsCommand()); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_COMPL_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_GetNextAtsCommand_Test_ExecutionBCompleted(void) { SC_AtsEntryHeader_t *Entry; - uint32 AtsTable[SC_ATS_BUFF_SIZE32]; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "ATS %%c Execution Completed"); - - SC_InitTables(); - - memset(&SC_ATSRQ_TEST_GlobalAtsInfoTable, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - memset(&SC_ATSRQ_TEST_GlobalAtsCtrlBlck, 0, sizeof(SC_ATSRQ_TEST_GlobalAtsCtrlBlck)); - - memset(&SC_STATE_TEST_GlobalRtsInfoTbl, 0, sizeof(SC_STATE_TEST_GlobalRtsInfoTbl)); - memset(&SC_STATE_TEST_GlobalRtsCtrlBlck, 0, sizeof(SC_STATE_TEST_GlobalRtsCtrlBlck)); - - SC_OperData.AtsInfoTblAddr = &SC_ATSRQ_TEST_GlobalAtsInfoTable[0]; - SC_OperData.AtsCtrlBlckAddr = &SC_ATSRQ_TEST_GlobalAtsCtrlBlck; - - SC_OperData.RtsInfoTblAddr = &SC_STATE_TEST_GlobalRtsInfoTbl[0]; - SC_OperData.RtsCtrlBlckAddr = &SC_STATE_TEST_GlobalRtsCtrlBlck; - - SC_OperData.AtsCmdStatusTblAddr[0] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[0]; - SC_OperData.AtsCmdStatusTblAddr[1] = &SC_ATSRQ_TEST_GlobalAtsCmdStatus[1]; - - SC_OperData.AtsTblAddr[0] = &AtsTable[0]; Entry = (SC_AtsEntryHeader_t *)&SC_OperData.AtsTblAddr[0][0]; Entry->CmdNumber = 1; @@ -1144,26 +671,13 @@ void SC_GetNextAtsCommand_Test_ExecutionBCompleted(void) SC_OperData.AtsInfoTblAddr[SC_ATP].NumberOfCommands = 0; /* Execute the function being tested */ - SC_GetNextAtsCommand(); + UtAssert_VOIDCALL(SC_GetNextAtsCommand()); /* Verify results */ UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_ATS_COMPL_INF_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_INFORMATION); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } -/* Unreachable branch in sc_state.c SC_UpdateNextTime:140. - RtsNumber can never be assigned a value > SC_NUMBER_RTS - due to processing logic in SC_GetNextRtsTime. */ - void UtTest_Setup(void) { UtTest_Add(SC_GetNextRtsTime_Test_Nominal, SC_Test_Setup, SC_Test_TearDown, "SC_GetNextRtsTime_Test_Nominal"); diff --git a/unit-test/sc_utils_tests.c b/unit-test/sc_utils_tests.c index d5aa700..6dcfb04 100644 --- a/unit-test/sc_utils_tests.c +++ b/unit-test/sc_utils_tests.c @@ -29,14 +29,13 @@ #include "utstubs.h" /* sc_utils_tests globals */ -uint8 call_count_CFE_EVS_SendEvent; void SC_GetCurrentTime_Test(void) { SC_AppData.CurrentTime = 0; /* Execute the function being tested */ - SC_GetCurrentTime(); + UtAssert_VOIDCALL(SC_GetCurrentTime()); /* Verify results */ UtAssert_True(SC_AppData.CurrentTime != 0, "SC_AppData.CurrentTime != 0"); @@ -44,191 +43,117 @@ void SC_GetCurrentTime_Test(void) void SC_GetAtsEntryTime_Test(void) { - SC_AbsTimeTag_t AbsTimeTag; - SC_AtsEntryHeader_t Entry; Entry.TimeTag_MS = 0; Entry.TimeTag_LS = 10; /* Execute the function being tested */ - AbsTimeTag = SC_GetAtsEntryTime(&Entry); - - /* Verify results */ - UtAssert_True(AbsTimeTag == 10, "AbsTimeTag == 10"); + UtAssert_UINT32_EQ(SC_GetAtsEntryTime(&Entry), Entry.TimeTag_LS); } void SC_ComputeAbsTime_Test(void) { - SC_AbsTimeTag_t AbsTimeTag; - SC_AppData.CurrentTime = 0; - /* Execute the function being tested */ - AbsTimeTag = SC_ComputeAbsTime(0); - - /* Verify results */ - - /* The CFE_TIME_Add stub increments when status >= 0 */ - UtAssert_True(AbsTimeTag == 1, "AbsTimeTag == 1"); + /* Execute the function being tested + * Note the CFE_TIME_Add stub increments when status >= 0 */ + UtAssert_UINT32_EQ(SC_ComputeAbsTime(0), 1); } void SC_CompareAbsTime_Test_True(void) { - bool Result; - SC_AbsTimeTag_t AbsTimeTag1 = {0}; SC_AbsTimeTag_t AbsTimeTag2 = {0}; UT_SetDeferredRetcode(UT_KEY(CFE_TIME_Compare), 1, CFE_TIME_A_GT_B); /* Execute the function being tested */ - Result = SC_CompareAbsTime(AbsTimeTag1, AbsTimeTag2); - - /* Verify results */ - UtAssert_True(Result == true, "Result == true"); + UtAssert_BOOL_TRUE(SC_CompareAbsTime(AbsTimeTag1, AbsTimeTag2)); } void SC_CompareAbsTime_Test_False(void) { - bool Result; - SC_AbsTimeTag_t AbsTimeTag1 = {0}; SC_AbsTimeTag_t AbsTimeTag2 = {0}; UT_SetDeferredRetcode(UT_KEY(CFE_TIME_Compare), 1, -1); /* Execute the function being tested */ - Result = SC_CompareAbsTime(AbsTimeTag1, AbsTimeTag2); - - /* Verify results */ - UtAssert_True(Result == false, "Result == false"); + UtAssert_BOOL_FALSE(SC_CompareAbsTime(AbsTimeTag1, AbsTimeTag2)); } void SC_VerifyCmdLength_Test_Nominal(void) { SC_NoArgsCmd_t CmdPacket; - bool Result; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_NOOP_CC; size_t MsgSize = sizeof(CmdPacket); - SC_InitTables(); - UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_AppendAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_VerifyCmdLength(&CmdPacket.CmdHeader.Msg, sizeof(CmdPacket)); + UtAssert_BOOL_TRUE(SC_VerifyCmdLength(&CmdPacket.CmdHeader.Msg, sizeof(CmdPacket))); /* Verify results */ - UtAssert_True(Result == true, "Result == true"); UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 0, "SC_OperData.HkPacket.CmdErrCtr == 0"); - 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); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 0); } void SC_VerifyCmdLength_Test_LenError(void) { SC_NoArgsCmd_t CmdPacket; - bool Result; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_CMD_MID); CFE_MSG_FcnCode_t FcnCode = SC_NOOP_CC; size_t MsgSize = sizeof(CmdPacket); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid msg length: ID = 0x%%08lX, CC = %%d, Len = %%d, Expected = %%d"); - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_AppendAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_VerifyCmdLength(&CmdPacket.CmdHeader.Msg, 999); + UtAssert_BOOL_FALSE(SC_VerifyCmdLength(&CmdPacket.CmdHeader.Msg, 999)); /* Verify results */ - UtAssert_True(Result == false, "Result == false"); UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "SC_OperData.HkPacket.CmdCtr == 0"); UtAssert_True(SC_OperData.HkPacket.CmdErrCtr == 1, "SC_OperData.HkPacket.CmdErrCtr == 1"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_LEN_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_VerifyCmdLength_Test_LenErrorNotMID(void) { SC_NoArgsCmd_t CmdPacket; - bool Result; CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(SC_SEND_HK_MID); CFE_MSG_FcnCode_t FcnCode = 0; size_t MsgSize = sizeof(CmdPacket); - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Invalid msg length: ID = 0x%%08lX, CC = %%d, Len = %%d, Expected = %%d"); - - SC_InitTables(); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(SC_AppendAtsCmd_t), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false); /* Execute the function being tested */ - Result = SC_VerifyCmdLength(&CmdPacket.CmdHeader.Msg, 999); + UtAssert_BOOL_FALSE(SC_VerifyCmdLength(&CmdPacket.CmdHeader.Msg, 999)); /* Verify results */ - UtAssert_True(Result == false, "Result == false"); UtAssert_True(SC_OperData.HkPacket.CmdCtr == 0, "SC_OperData.HkPacket.CmdCtr == 0"); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, SC_LEN_ERR_EID); - UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_ERROR); - - strCmpResult = strncmp(ExpectedEventString, context_CFE_EVS_SendEvent[0].Spec, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH); - - UtAssert_True(strCmpResult == 0, "Event string matched expected result, '%s'", context_CFE_EVS_SendEvent[0].Spec); - - call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); - - UtAssert_True(call_count_CFE_EVS_SendEvent == 1, "CFE_EVS_SendEvent was called %u time(s), expected 1", - call_count_CFE_EVS_SendEvent); + UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1); } void SC_ToggleAtsIndex_Test(void) { - uint16 Result; - - SC_AtpControlBlock_t AtsCtrlBlck; - - SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlck; - SC_OperData.AtsCtrlBlckAddr->AtsNumber = 1; - Result = SC_ToggleAtsIndex(); - - UtAssert_True(Result == 1, "Result == 1"); + UtAssert_UINT16_EQ(SC_ToggleAtsIndex(), 1); SC_OperData.AtsCtrlBlckAddr->AtsNumber = 2; - Result = SC_ToggleAtsIndex(); - - UtAssert_True(Result == 0, "Result == 0"); + UtAssert_UINT16_EQ(SC_ToggleAtsIndex(), 0); } void UtTest_Setup(void) diff --git a/unit-test/utilities/sc_test_utils.c b/unit-test/utilities/sc_test_utils.c index 279338a..9b81e13 100644 --- a/unit-test/utilities/sc_test_utils.c +++ b/unit-test/utilities/sc_test_utils.c @@ -37,10 +37,19 @@ #define UT_MAX_SENDEVENT_DEPTH 4 CFE_EVS_SendEvent_context_t context_CFE_EVS_SendEvent[UT_MAX_SENDEVENT_DEPTH]; CFE_ES_WriteToSysLog_context_t context_CFE_ES_WriteToSysLog; -SC_RtsInfoEntry_t RtsInfoTbl[SC_NUMBER_OF_RTS]; UT_CmdBuf_t UT_CmdBuf; +/* Table buffers */ +uint32 AtsTblAddr[SC_NUMBER_OF_ATS][SC_ATS_BUFF_SIZE32]; +uint32 AppendTblAddr[SC_APPEND_BUFF_SIZE32]; +uint32 RtsTblAddr[SC_NUMBER_OF_RTS][SC_RTS_BUFF_SIZE32]; +SC_AtsInfoTable_t AtsInfoTblAddr[SC_NUMBER_OF_ATS]; +SC_RtsInfoEntry_t RtsInfoTblAddr[SC_NUMBER_OF_RTS]; +SC_RtpControlBlock_t RtsCtrlBlckAddr; +SC_AtpControlBlock_t AtsCtrlBlckAddr; +uint32 AtsCmdStatusTblAddr[SC_NUMBER_OF_ATS][SC_MAX_ATS_CMDS]; + /* * Function Definitions */ @@ -75,20 +84,54 @@ void UT_Handler_CFE_ES_WriteToSysLog(void *UserObj, UT_EntryKey_t FuncKey, const context_CFE_ES_WriteToSysLog.Spec[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH - 1] = '\0'; } +void SC_Test_SetTableAddrs(void) +{ + uint8 i; + + /* Set table addresses */ + for (i = 0; i < SC_NUMBER_OF_ATS; i++) + { + SC_OperData.AtsTblAddr[i] = AtsTblAddr[i]; + SC_OperData.AtsCmdStatusTblAddr[i] = AtsCmdStatusTblAddr[i]; + } + for (i = 0; i < SC_NUMBER_OF_RTS; i++) + { + SC_OperData.RtsTblAddr[i] = RtsTblAddr[i]; + } + SC_OperData.AppendTblAddr = AppendTblAddr; + SC_OperData.AtsInfoTblAddr = AtsInfoTblAddr; + SC_OperData.RtsInfoTblAddr = RtsInfoTblAddr; + SC_OperData.RtsCtrlBlckAddr = &RtsCtrlBlckAddr; + SC_OperData.AtsCtrlBlckAddr = &AtsCtrlBlckAddr; +} + void SC_Test_Setup(void) { + /* initialize test environment to default state for every test */ UT_ResetState(0); + /* Clear app data */ memset(&SC_OperData, 0, sizeof(SC_OperData)); memset(&SC_AppData, 0, sizeof(SC_AppData)); - memset(RtsInfoTbl, 0, sizeof(RtsInfoTbl)); + /* Clear table buffers */ + memset(&AtsTblAddr, 0, sizeof(AtsTblAddr)); + memset(&AppendTblAddr, 0, sizeof(AppendTblAddr)); + memset(&RtsTblAddr, 0, sizeof(RtsTblAddr)); + memset(&AtsInfoTblAddr, 0, sizeof(AtsInfoTblAddr)); + memset(&RtsInfoTblAddr, 0, sizeof(RtsInfoTblAddr)); + memset(&RtsCtrlBlckAddr, 0, sizeof(RtsCtrlBlckAddr)); + memset(&AtsCtrlBlckAddr, 0, sizeof(AtsCtrlBlckAddr)); + memset(&AtsCmdStatusTblAddr, 0, sizeof(AtsCmdStatusTblAddr)); + + /* Clear unit test buffers */ memset(context_CFE_EVS_SendEvent, 0, sizeof(context_CFE_EVS_SendEvent)); memset(&context_CFE_ES_WriteToSysLog, 0, sizeof(context_CFE_ES_WriteToSysLog)); memset(&UT_CmdBuf, 0, sizeof(UT_CmdBuf)); - SC_OperData.RtsInfoTblAddr = &RtsInfoTbl[0]; + /* Set table addresses */ + SC_Test_SetTableAddrs(); /* Register custom handlers */ UT_SetVaHandlerFunction(UT_KEY(CFE_EVS_SendEvent), UT_Handler_CFE_EVS_SendEvent, NULL); diff --git a/unit-test/utilities/sc_test_utils.h b/unit-test/utilities/sc_test_utils.h index abef4c6..ebf6c90 100644 --- a/unit-test/utilities/sc_test_utils.h +++ b/unit-test/utilities/sc_test_utils.h @@ -33,9 +33,8 @@ #include "cfe_msgids.h" #include "cfe_tbl_msg.h" -extern SC_AppData_t SC_AppData; -extern SC_OperData_t SC_OperData; -extern SC_RtsInfoEntry_t RtsInfoTbl[SC_NUMBER_OF_RTS]; +extern SC_AppData_t SC_AppData; +extern SC_OperData_t SC_OperData; /* * Global context structures @@ -80,6 +79,7 @@ extern UT_CmdBuf_t UT_CmdBuf; * Function Definitions */ +void SC_Test_SetTableAddrs(void); void SC_Test_Setup(void); void SC_Test_TearDown(void);