diff --git a/fsw/src/md_app.c b/fsw/src/md_app.c index ee671f1..9d849ab 100644 --- a/fsw/src/md_app.c +++ b/fsw/src/md_app.c @@ -69,7 +69,7 @@ void MD_AppMain(void) if (Status != CFE_SUCCESS) { - CFE_ES_WriteToSysLog("MD:Application Init Failed,RC=%d\n", Status); + CFE_ES_WriteToSysLog("MD:Application Init Failed,RC=%08x\n", (unsigned int)Status); MD_AppData.RunStatus = CFE_ES_RunStatus_APP_ERROR; } @@ -97,7 +97,7 @@ void MD_AppMain(void) ** Exit on pipe read error */ CFE_EVS_SendEvent(MD_PIPE_ERR_EID, CFE_EVS_EventType_ERROR, - "SB Pipe Read Error, App will exit. Pipe Return Status = %d", Status); + "SB Pipe Read Error, App will exit. Pipe Return Status = %08x", (unsigned int)Status); MD_AppData.RunStatus = CFE_ES_RunStatus_APP_ERROR; } @@ -194,7 +194,7 @@ CFE_Status_t MD_AppInit(void) } else { - CFE_ES_WriteToSysLog("MD_APP:Call to CFE_EVS_Register Failed:RC=%d\n", Status); + CFE_ES_WriteToSysLog("MD_APP:Call to CFE_EVS_Register Failed:RC=%d\n", (unsigned int)Status); } /* @@ -280,12 +280,13 @@ CFE_Status_t MD_InitSoftwareBusServices(void) if (Status != CFE_SUCCESS) { CFE_EVS_SendEvent(MD_SUB_HK_ERR_EID, CFE_EVS_EventType_ERROR, "Failed to subscribe to HK requests RC = %d", - Status); + (unsigned int)Status); } } else { - CFE_EVS_SendEvent(MD_CREATE_PIPE_ERR_EID, CFE_EVS_EventType_ERROR, "Failed to create pipe. RC = %d", Status); + CFE_EVS_SendEvent(MD_CREATE_PIPE_ERR_EID, CFE_EVS_EventType_ERROR, "Failed to create pipe. RC = %d", + (unsigned int)Status); } /* @@ -298,7 +299,7 @@ CFE_Status_t MD_InitSoftwareBusServices(void) if (Status != CFE_SUCCESS) { CFE_EVS_SendEvent(MD_SUB_CMD_ERR_EID, CFE_EVS_EventType_ERROR, "Failed to subscribe to commands. RC = %d", - Status); + (unsigned int)Status); } } @@ -312,7 +313,7 @@ CFE_Status_t MD_InitSoftwareBusServices(void) if (Status != CFE_SUCCESS) { CFE_EVS_SendEvent(MD_SUB_WAKEUP_ERR_EID, CFE_EVS_EventType_ERROR, - "Failed to subscribe to wakeup messages. RC = %d", Status); + "Failed to subscribe to wakeup messages. RC = %08x", (unsigned int)Status); } } @@ -348,7 +349,8 @@ CFE_Status_t MD_InitTableServices(void) if (Status < 0) { CFE_EVS_SendEvent(MD_INIT_TBL_NAME_ERR_EID, CFE_EVS_EventType_ERROR, - "TableName could not be made. Err=0x%08X, Idx=%d", Status, TblIndex); + "TableName could not be made. Err=0x%08X, Idx=%u", (unsigned int)Status, + (unsigned int)TblIndex); TableInitValidFlag = false; @@ -362,7 +364,8 @@ CFE_Status_t MD_InitTableServices(void) if (Status < 0) { CFE_EVS_SendEvent(MD_INIT_TBL_FILENAME_ERR_EID, CFE_EVS_EventType_ERROR, - "TblFileName could not be made. Err=0x%08X, Idx=%d", Status, TblIndex); + "TblFileName could not be made. Err=0x%08X, Idx=%u", (unsigned int)Status, + (unsigned int)TblIndex); TableInitValidFlag = false; @@ -433,7 +436,8 @@ CFE_Status_t MD_InitTableServices(void) else if (Status != CFE_SUCCESS) { CFE_EVS_SendEvent(MD_TBL_REGISTER_CRIT_EID, CFE_EVS_EventType_CRITICAL, - "CFE_TBL_Register error %d received for tbl#%d", Status, TblIndex + 1); + "CFE_TBL_Register error %08x received for tbl#%u", (unsigned int)Status, + (unsigned int)TblIndex + 1); TableInitValidFlag = false; } else @@ -455,8 +459,8 @@ CFE_Status_t MD_InitTableServices(void) if (Status != CFE_SUCCESS) { - CFE_ES_WriteToSysLog("MD_APP: Error 0x%08X received loading tbl#%d\n", (unsigned int)Status, - TblIndex + 1); + CFE_ES_WriteToSysLog("MD_APP: Error 0x%08X received loading tbl#%u\n", (unsigned int)Status, + (unsigned int)TblIndex + 1); TableInitValidFlag = false; } else @@ -475,7 +479,7 @@ CFE_Status_t MD_InitTableServices(void) /* Output init and recovery event message */ CFE_EVS_SendEvent(MD_TBL_INIT_INF_EID, CFE_EVS_EventType_INFORMATION, - "Dwell Tables Recovered: %d, Dwell Tables Initialized: %d", TblRecos, TblInits); + "Dwell Tables Recovered: %u, Dwell Tables Initialized: %u", TblRecos, TblInits); if (TableInitValidFlag == true) { @@ -533,8 +537,8 @@ CFE_Status_t MD_ManageDwellTable(uint8 TblIndex) else { CFE_EVS_SendEvent(MD_NO_TBL_COPY_ERR_EID, CFE_EVS_EventType_ERROR, - "Didn't update MD tbl #%d due to unexpected CFE_TBL_GetAddress return: %d", - TblIndex + 1, GetAddressResult); + "Didn't update MD tbl #%d due to unexpected CFE_TBL_GetAddress return: %u", + (unsigned int)TblIndex + 1, (unsigned int)GetAddressResult); } /* Unlock Table */ @@ -548,7 +552,8 @@ CFE_Status_t MD_ManageDwellTable(uint8 TblIndex) else if ((Status & CFE_SEVERITY_BITMASK) == CFE_SEVERITY_ERROR) { CFE_EVS_SendEvent(MD_TBL_STATUS_ERR_EID, CFE_EVS_EventType_ERROR, - "Received unexpected error %d from CFE_TBL_GetStatus for tbl #%d", Status, TblIndex + 1); + "Received unexpected error %08x from CFE_TBL_GetStatus for tbl #%u", (unsigned int)Status, + (unsigned int)TblIndex + 1); FinishedManaging = true; } diff --git a/fsw/src/md_cmds.c b/fsw/src/md_cmds.c index 36b068f..54e891f 100644 --- a/fsw/src/md_cmds.c +++ b/fsw/src/md_cmds.c @@ -115,7 +115,7 @@ void MD_ProcessStartCmd(const CFE_SB_Buffer_t *BufPtr) CFE_EVS_SendEvent(MD_START_DWELL_ERR_EID, CFE_EVS_EventType_ERROR, "Start Dwell Table for mask 0x%04X failed for %d of %d tables", Start->Payload.TableMask, - ErrorCount, NumTblInMask); + (int)ErrorCount, (int)NumTblInMask); } } else /* No valid table id's specified in mask */ @@ -166,7 +166,8 @@ void MD_ProcessStopCmd(const CFE_SB_Buffer_t *BufPtr) if (ErrorCount == 0) { CFE_EVS_SendEvent(MD_STOP_DWELL_INF_EID, CFE_EVS_EventType_INFORMATION, - "Stop Dwell Table command processed successfully for table mask 0x%04X", Stop->Payload.TableMask); + "Stop Dwell Table command processed successfully for table mask 0x%04X", + Stop->Payload.TableMask); MD_AppData.CmdCounter++; } @@ -176,7 +177,7 @@ void MD_ProcessStopCmd(const CFE_SB_Buffer_t *BufPtr) CFE_EVS_SendEvent(MD_STOP_DWELL_ERR_EID, CFE_EVS_EventType_ERROR, "Stop Dwell Table for mask 0x%04X failed for %d of %d tables", Stop->Payload.TableMask, - ErrorCount, NumTblInMask); + (int)ErrorCount, (int)NumTblInMask); } } else @@ -265,8 +266,8 @@ void MD_ProcessJamCmd(const CFE_SB_Buffer_t *BufPtr) if (Status == CFE_SUCCESS) { CFE_EVS_SendEvent(MD_JAM_NULL_DWELL_INF_EID, CFE_EVS_EventType_INFORMATION, - "Successful Jam of a Null Dwell Entry to Dwell Tbl#%d Entry #%d", Jam->Payload.TableId, - Jam->Payload.EntryId); + "Successful Jam of a Null Dwell Entry to Dwell Tbl#%d Entry #%d", + Jam->Payload.TableId, Jam->Payload.EntryId); } else { @@ -311,14 +312,16 @@ void MD_ProcessJamCmd(const CFE_SB_Buffer_t *BufPtr) AllInputsValid = false; } #if MD_ENFORCE_DWORD_ALIGN == 0 - else if ((Jam->Payload.FieldLength == 4) && MD_Verify16Aligned(ResolvedAddr, (uint32)Jam->Payload.FieldLength) != true) + else if ((Jam->Payload.FieldLength == 4) && + MD_Verify16Aligned(ResolvedAddr, (uint32)Jam->Payload.FieldLength) != true) { CFE_EVS_SendEvent(MD_JAM_ADDR_NOT_16BIT_ERR_EID, CFE_EVS_EventType_ERROR, "Jam Cmd rejected because address 0x%08X is not 16-bit aligned", ResolvedAddr); AllInputsValid = false; } #else - else if ((Jam->Payload.FieldLength == 4) && MD_Verify32Aligned(ResolvedAddr, (uint32)Jam->Payload.FieldLength) != true) + else if ((Jam->Payload.FieldLength == 4) && + MD_Verify32Aligned(ResolvedAddr, (uint32)Jam->Payload.FieldLength) != true) { CFE_EVS_SendEvent(MD_JAM_ADDR_NOT_32BIT_ERR_EID, CFE_EVS_EventType_ERROR, "Jam Cmd rejected because address 0x%08X is not 32-bit aligned", @@ -326,7 +329,8 @@ void MD_ProcessJamCmd(const CFE_SB_Buffer_t *BufPtr) AllInputsValid = false; } #endif - else if ((Jam->Payload.FieldLength == 2) && MD_Verify16Aligned(ResolvedAddr, (uint32)Jam->Payload.FieldLength) != true) + else if ((Jam->Payload.FieldLength == 2) && + MD_Verify16Aligned(ResolvedAddr, (uint32)Jam->Payload.FieldLength) != true) { CFE_EVS_SendEvent(MD_JAM_ADDR_NOT_16BIT_ERR_EID, CFE_EVS_EventType_ERROR, "Jam Cmd rejected because address 0x%08X is not 16-bit aligned", @@ -356,19 +360,21 @@ void MD_ProcessJamCmd(const CFE_SB_Buffer_t *BufPtr) strncpy(NewDwellAddress.SymName, Jam->Payload.DwellAddress.SymName, OS_MAX_SYM_LEN - 1); NewDwellAddress.SymName[OS_MAX_SYM_LEN - 1] = '\0'; - Status = MD_UpdateTableDwellEntry(TableIndex, EntryIndex, Jam->Payload.FieldLength, Jam->Payload.DwellDelay, - NewDwellAddress); + Status = MD_UpdateTableDwellEntry(TableIndex, EntryIndex, Jam->Payload.FieldLength, + Jam->Payload.DwellDelay, NewDwellAddress); /* Issue event */ if (Status == CFE_SUCCESS) { CFE_EVS_SendEvent(MD_JAM_DWELL_INF_EID, CFE_EVS_EventType_INFORMATION, - "Successful Jam to Dwell Tbl#%d Entry #%d", Jam->Payload.TableId, Jam->Payload.EntryId); + "Successful Jam to Dwell Tbl#%d Entry #%d", Jam->Payload.TableId, + Jam->Payload.EntryId); } else { CFE_EVS_SendEvent(MD_JAM_DWELL_ERR_EID, CFE_EVS_EventType_ERROR, - "Failed Jam to Dwell Tbl#%d Entry #%d", Jam->Payload.TableId, Jam->Payload.EntryId); + "Failed Jam to Dwell Tbl#%d Entry #%d", Jam->Payload.TableId, + Jam->Payload.EntryId); AllInputsValid = false; } @@ -451,7 +457,8 @@ void MD_ProcessSignatureCmd(const CFE_SB_Buffer_t *BufPtr) */ { /* Copy signature field to local dwell control structure */ - strncpy(MD_AppData.MD_DwellTables[TblId - 1].Signature, SignatureCmd->Payload.Signature, MD_SIGNATURE_FIELD_LENGTH - 1); + strncpy(MD_AppData.MD_DwellTables[TblId - 1].Signature, SignatureCmd->Payload.Signature, + MD_SIGNATURE_FIELD_LENGTH - 1); MD_AppData.MD_DwellTables[TblId - 1].Signature[MD_SIGNATURE_FIELD_LENGTH - 1] = '\0'; /* Update signature in Table Services buffer */ @@ -459,14 +466,16 @@ void MD_ProcessSignatureCmd(const CFE_SB_Buffer_t *BufPtr) if (Status == CFE_SUCCESS) { CFE_EVS_SendEvent(MD_SET_SIGNATURE_INF_EID, CFE_EVS_EventType_INFORMATION, - "Successfully set signature for Dwell Tbl#%d to '%s'", TblId, SignatureCmd->Payload.Signature); + "Successfully set signature for Dwell Tbl#%d to '%s'", TblId, + SignatureCmd->Payload.Signature); MD_AppData.CmdCounter++; } else { CFE_EVS_SendEvent(MD_SET_SIGNATURE_ERR_EID, CFE_EVS_EventType_ERROR, - "Failed to set signature for Dwell Tbl#%d. Update returned 0x%08X", TblId, Status); + "Failed to set signature for Dwell Tbl#%d. Update returned 0x%08X", (int)TblId, + (unsigned int)Status); MD_AppData.ErrCounter++; } diff --git a/fsw/src/md_dwell_tbl.c b/fsw/src/md_dwell_tbl.c index 3b87465..c511bdb 100644 --- a/fsw/src/md_dwell_tbl.c +++ b/fsw/src/md_dwell_tbl.c @@ -220,7 +220,7 @@ int32 MD_CheckTableEntries(MD_DwellTableLoad_t *TblPtr, uint16 *ErrorEntryArg) /* Keep counting good,bad,unused, don't exit immediately */ CFE_EVS_SendEvent(MD_TBL_ENTRY_ERR_EID, CFE_EVS_EventType_ERROR, - "Table entry %d failed with status 0x%08X", EntryIndex, Status); + "Table entry %d failed with status 0x%08X", (int)EntryIndex, (unsigned int)Status); } } } @@ -343,8 +343,8 @@ CFE_Status_t MD_UpdateTableEnabledField(uint16 TableIndex, uint16 FieldValue) if ((Status != CFE_SUCCESS) && (Status != CFE_TBL_INFO_UPDATED)) { CFE_EVS_SendEvent(MD_UPDATE_TBL_EN_ERR_EID, CFE_EVS_EventType_ERROR, - "MD_UpdateTableEnabledField, TableIndex %d: CFE_TBL_GetAddress Returned 0x%08x", TableIndex, - Status); + "MD_UpdateTableEnabledField, TableIndex %d: CFE_TBL_GetAddress Returned 0x%08x", + (int)TableIndex, (unsigned int)Status); } else { @@ -375,8 +375,8 @@ CFE_Status_t MD_UpdateTableDwellEntry(uint16 TableIndex, uint16 EntryIndex, uint if ((Status != CFE_SUCCESS) && (Status != CFE_TBL_INFO_UPDATED)) { CFE_EVS_SendEvent(MD_UPDATE_TBL_DWELL_ERR_EID, CFE_EVS_EventType_ERROR, - "MD_UpdateTableDwellEntry, TableIndex %d: CFE_TBL_GetAddress Returned 0x%08x", TableIndex, - Status); + "MD_UpdateTableDwellEntry, TableIndex %d: CFE_TBL_GetAddress Returned 0x%08x", + (int)TableIndex, (unsigned int)Status); } else { @@ -420,8 +420,8 @@ CFE_Status_t MD_UpdateTableSignature(uint16 TableIndex, char NewSignature[MD_SIG if ((Status != CFE_SUCCESS) && (Status != CFE_TBL_INFO_UPDATED)) { CFE_EVS_SendEvent(MD_UPDATE_TBL_SIG_ERR_EID, CFE_EVS_EventType_ERROR, - "MD_UpdateTableSignature, TableIndex %d: CFE_TBL_GetAddress Returned 0x%08x", TableIndex, - Status); + "MD_UpdateTableSignature, TableIndex %d: CFE_TBL_GetAddress Returned 0x%08x", (int)TableIndex, + (unsigned int)Status); } else { diff --git a/unit-test/md_app_tests.c b/unit-test/md_app_tests.c index 4290903..a801327 100644 --- a/unit-test/md_app_tests.c +++ b/unit-test/md_app_tests.c @@ -55,10 +55,6 @@ CFE_Status_t MD_DWELL_TBL_TEST_CFE_TBL_GetAddressHook(void *UserObj, int32 StubR void MD_AppMain_Test_AppInitError(void) { - int32 strCmpResult; - char ExpectedSysLogString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - snprintf(ExpectedSysLogString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, "MD:Application Init Failed,RC=%%d\n"); - /* Set to make MD_AppInit return -1, in order to generate log message "Application Init Failed" */ UT_SetDeferredRetcode(UT_KEY(CFE_EVS_Register), 1, -1); @@ -72,21 +68,10 @@ void MD_AppMain_Test_AppInitError(void) 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); - - /* Generates 1 log message we don't care about in this test */ - UtAssert_True(strCmpResult == 0, "Sys Log string matched expected result, '%s'", context_CFE_ES_WriteToSysLog.Spec); } void MD_AppMain_Test_RcvMsgError(void) { - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "SB Pipe Read Error, App will exit. Pipe Return Status = %%d"); - /* Set to prevent unintended error messages */ UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_Load), CFE_SUCCESS); @@ -106,10 +91,6 @@ void MD_AppMain_Test_RcvMsgError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[2].EventID, MD_PIPE_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 2 event messages we don't care about in this test */ call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -256,7 +237,7 @@ void MD_AppMain_Test_CmdNominal(void) CFE_MSG_FcnCode_t FcnCode; size_t MsgSize; MD_NoArgsCmd_t Packet; - MD_NoArgsCmd_t * TempBuf = &Packet; + MD_NoArgsCmd_t *TempBuf = &Packet; /* Set to prevent unintended error messages */ UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_Load), CFE_SUCCESS); @@ -609,7 +590,8 @@ void MD_InitSoftwareBusServices_Test_Nominal(void) /* Verify results */ #if MD_SIGNATURE_OPTION == 1 - UtAssert_True(MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == '\0', "MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == ''"); + UtAssert_True(MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == '\0', + "MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == ''"); UtAssert_True(MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES / 2].Payload.Signature[0] == '\0', "MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES/2].Payload.Signature[0] == ''"); UtAssert_True(MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES - 1].Payload.Signature[0] == '\0', @@ -640,7 +622,8 @@ void MD_InitSoftwareBusServices_Test_CreatePipeError(void) /* Verify results */ #if MD_SIGNATURE_OPTION == 1 - UtAssert_True(MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == '\0', "MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == ''"); + UtAssert_True(MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == '\0', + "MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == ''"); UtAssert_True(MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES / 2].Payload.Signature[0] == '\0', "MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES/2].Payload.Signature[0] == ''"); UtAssert_True(MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES - 1].Payload.Signature[0] == '\0', @@ -678,7 +661,8 @@ void MD_InitSoftwareBusServices_Test_SubscribeHkError(void) /* Verify results */ #if MD_SIGNATURE_OPTION == 1 - UtAssert_True(MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == '\0', "MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == ''"); + UtAssert_True(MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == '\0', + "MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == ''"); UtAssert_True(MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES / 2].Payload.Signature[0] == '\0', "MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES/2].Payload.Signature[0] == ''"); UtAssert_True(MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES - 1].Payload.Signature[0] == '\0', @@ -716,7 +700,8 @@ void MD_InitSoftwareBusServices_Test_SubscribeCmdError(void) /* Verify results */ #if MD_SIGNATURE_OPTION == 1 - UtAssert_True(MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == '\0', "MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == ''"); + UtAssert_True(MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == '\0', + "MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == ''"); UtAssert_True(MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES / 2].Payload.Signature[0] == '\0', "MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES/2].Payload.Signature[0] == ''"); UtAssert_True(MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES - 1].Payload.Signature[0] == '\0', @@ -741,11 +726,6 @@ void MD_InitSoftwareBusServices_Test_SubscribeCmdError(void) void MD_InitSoftwareBusServices_Test_SubscribeWakeupError(void) { CFE_Status_t Result; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Failed to subscribe to wakeup messages. RC = %%d"); /* Set to generate error message MD_SUB_HK_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(CFE_SB_Subscribe), 3, -1); @@ -755,7 +735,8 @@ void MD_InitSoftwareBusServices_Test_SubscribeWakeupError(void) /* Verify results */ #if MD_SIGNATURE_OPTION == 1 - UtAssert_True(MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == '\0', "MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == ''"); + UtAssert_True(MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == '\0', + "MD_AppData.MD_DwellPkt[0].Payload.Signature[0] == ''"); UtAssert_True(MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES / 2].Payload.Signature[0] == '\0', "MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES/2].Payload.Signature[0] == ''"); UtAssert_True(MD_AppData.MD_DwellPkt[MD_NUM_DWELL_TABLES - 1].Payload.Signature[0] == '\0', @@ -767,10 +748,6 @@ void MD_InitSoftwareBusServices_Test_SubscribeWakeupError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, MD_SUB_WAKEUP_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", @@ -830,29 +807,15 @@ void MD_InitTableServices_Test_GetAddressErrorAndLoadError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, MD_TBL_INIT_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); - - 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); } void MD_InitTableServices_Test_TblRecoveredValidThenTblInits(void) { CFE_Status_t Result; - int32 strCmpResult; - char ExpectedEventString[4][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Dwell Tables Recovered: %%d, Dwell Tables Initialized: %%d"); /* Set to satisfy condition "Status == CFE_TBL_INFO_RECOVERED_TBL" */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 1, CFE_TBL_INFO_RECOVERED_TBL); @@ -879,11 +842,6 @@ void MD_InitTableServices_Test_TblRecoveredValidThenTblInits(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, MD_TBL_INIT_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", @@ -945,11 +903,6 @@ void MD_InitTableServices_Test_TblRecoveredNotValid(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, MD_TBL_INIT_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", @@ -1009,11 +962,6 @@ void MD_InitTableServices_Test_DwellStreamEnabled(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, MD_TBL_INIT_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", @@ -1075,11 +1023,6 @@ void MD_InitTableServices_Test_TblNotRecovered(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, MD_TBL_INIT_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); } void MD_InitTableServices_Test_TblTooLarge(void) @@ -1117,11 +1060,6 @@ void MD_InitTableServices_Test_TblTooLarge(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[1].EventID, MD_TBL_INIT_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", @@ -1131,14 +1069,6 @@ void MD_InitTableServices_Test_TblTooLarge(void) void MD_InitTableServices_Test_TblRegisterCriticalError(void) { CFE_Status_t Result; - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "CFE_TBL_Register error %%d received for tbl#%%d"); - - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Dwell Tables Recovered: %%d, Dwell Tables Initialized: %%d"); /* Set to satisfy condition "Status != CFE_SUCCESS" */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_Register), 1, -1); @@ -1156,19 +1086,9 @@ void MD_InitTableServices_Test_TblRegisterCriticalError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, MD_TBL_REGISTER_CRIT_EID); UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventType, CFE_EVS_EventType_CRITICAL); - 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, MD_TBL_INIT_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", @@ -1177,15 +1097,6 @@ void MD_InitTableServices_Test_TblRegisterCriticalError(void) void MD_InitTableServices_Test_TblNameError(void) { - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "TableName could not be made. Err=0x%%08X, Idx=%%d"); - - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Dwell Tables Recovered: %%d, Dwell Tables Initialized: %%d"); - /* Set to generate snprintf error MD_INIT_TBL_NAME_ERR_EID */ UT_SetDeferredRetcode(UT_KEY(stub_snprintf), 1, -1); @@ -1196,33 +1107,14 @@ void MD_InitTableServices_Test_TblNameError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, MD_INIT_TBL_NAME_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, MD_TBL_INIT_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); - UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } void MD_InitTableServices_Test_TblFileNameError(void) { - int32 strCmpResult; - char ExpectedEventString[2][CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString[0], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "TblFileName could not be made. Err=0x%%08X, Idx=%%d"); - - snprintf(ExpectedEventString[1], CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Dwell Tables Recovered: %%d, Dwell Tables Initialized: %%d"); - /* Set to generate snprintf MD_INIT_TBL_FILENAME_ERR_EID error */ UT_SetDeferredRetcode(UT_KEY(stub_snprintf), 2, -1); @@ -1233,19 +1125,9 @@ void MD_InitTableServices_Test_TblFileNameError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, MD_INIT_TBL_FILENAME_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, MD_TBL_INIT_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); - UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 2); } @@ -1372,11 +1254,6 @@ void MD_ManageDwellTable_Test_UpdatePendingTblCopyError(void) { CFE_Status_t Result; uint8 TblIndex = 0; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Didn't update MD tbl #%%d due to unexpected CFE_TBL_GetAddress return: %%d"); /* Set to satisfy condition "Status == CFE_TBL_INFO_UPDATE_PENDING" */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetStatus), 1, CFE_TBL_INFO_UPDATE_PENDING); @@ -1393,10 +1270,6 @@ void MD_ManageDwellTable_Test_UpdatePendingTblCopyError(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, MD_NO_TBL_COPY_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", @@ -1407,11 +1280,6 @@ void MD_ManageDwellTable_Test_TblStatusErr(void) { CFE_Status_t Result; uint8 TblIndex = 0; - int32 strCmpResult; - char ExpectedEventString[CFE_MISSION_EVS_MAX_MESSAGE_LENGTH]; - - snprintf(ExpectedEventString, CFE_MISSION_EVS_MAX_MESSAGE_LENGTH, - "Received unexpected error %%d from CFE_TBL_GetStatus for tbl #%%d"); /* Set to satisfy condition "(Status & CFE_SEVERITY_BITMASK) == CFE_SEVERITY_ERROR" */ UT_SetDeferredRetcode(UT_KEY(CFE_TBL_GetStatus), 1, CFE_SEVERITY_BITMASK); @@ -1425,10 +1293,6 @@ void MD_ManageDwellTable_Test_TblStatusErr(void) UtAssert_INT32_EQ(context_CFE_EVS_SendEvent[0].EventID, MD_TBL_STATUS_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", @@ -1716,9 +1580,12 @@ void MD_HkStatus_Test(void) UtAssert_True(MD_AppData.HkPkt.Payload.ValidCmdCntr == 1, "MD_AppData.HkPkt.Payload.ValidCmdCntr == 1"); UtAssert_True(MD_AppData.HkPkt.Payload.InvalidCmdCntr == 2, "MD_AppData.HkPkt.Payload.InvalidCmdCntr == 2"); - UtAssert_True(MD_AppData.HkPkt.Payload.DwellTblAddrCount[0] == 1, "MD_AppData.HkPkt.Payload.DwellTblAddrCount[0] == 1"); - UtAssert_True(MD_AppData.HkPkt.Payload.NumWaitsPerPkt[0] == 2, "MD_AppData.HkPkt.Payload.NumWaitsPerPkt[0] == 2"); - UtAssert_True(MD_AppData.HkPkt.Payload.DwellPktOffset[0] == 3, "MD_AppData.HkPkt.Payload.DwellPktOffset[0] == 3"); + UtAssert_True(MD_AppData.HkPkt.Payload.DwellTblAddrCount[0] == 1, + "MD_AppData.HkPkt.Payload.DwellTblAddrCount[0] == 1"); + UtAssert_True(MD_AppData.HkPkt.Payload.NumWaitsPerPkt[0] == 2, + "MD_AppData.HkPkt.Payload.NumWaitsPerPkt[0] == 2"); + UtAssert_True(MD_AppData.HkPkt.Payload.DwellPktOffset[0] == 3, + "MD_AppData.HkPkt.Payload.DwellPktOffset[0] == 3"); UtAssert_True(MD_AppData.HkPkt.Payload.ByteCount[0] == 4, "MD_AppData.HkPkt.Payload.ByteCount[0] == 4"); UtAssert_True(MD_AppData.HkPkt.Payload.DwellTblEntry[0] == 5, "MD_AppData.HkPkt.Payload.DwellTblEntry[0] == 5"); UtAssert_True(MD_AppData.HkPkt.Payload.Countdown[0] == 6, "MD_AppData.HkPkt.Payload.Countdown[0] == 6"); diff --git a/unit-test/md_dwell_tbl_tests.c b/unit-test/md_dwell_tbl_tests.c index 2748ecc..5f75172 100644 --- a/unit-test/md_dwell_tbl_tests.c +++ b/unit-test/md_dwell_tbl_tests.c @@ -721,7 +721,7 @@ void MD_ValidTableEntry_Test_InvalidLength(void) Result = MD_ValidTableEntry(&Entry); /* Verify results */ - UtAssert_True(Result == MD_INVALID_LEN_ERROR, "Result == MD_INVALID_LEN_ERROR 0x%x", Result); + UtAssert_INT32_EQ(Result, MD_INVALID_LEN_ERROR); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent)); @@ -850,7 +850,7 @@ void MD_ValidTableEntry_Test_NotAligned16DwellLength2(void) Result = MD_ValidTableEntry(&Entry); /* Verify results */ - UtAssert_True(Result == MD_NOT_ALIGNED_ERROR, "Result == MD_NOT_ALIGNED_ERROR 0x%x", Result); + UtAssert_INT32_EQ(Result, MD_NOT_ALIGNED_ERROR); call_count_CFE_EVS_SendEvent = UT_GetStubCount(UT_KEY(CFE_EVS_SendEvent));