Skip to content

Fix #100, Check CFE_SB_NO_MESSAGE return code #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
anhvan989 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #100, Check CFE_SB_NO_MESSAGE return code #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fsw/src/mm_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void MM_AppMain(void) {
if ((Status == CFE_SUCCESS) && (BufPtr != NULL)) {
/* Process Software Bus message */
MM_TaskPipe(BufPtr);
} else if (Status == CFE_SB_TIME_OUT) {
} else if (Status == CFE_SB_TIME_OUT || Status == CFE_SB_NO_MESSAGE) {
/* No action, but also no error */
} else {
/*
Expand Down
35 changes: 35 additions & 0 deletions unit-test/mm_app_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@
/* Function Definitions */
/* ==================== */

int32 MM_APP_TEST_CFE_ES_ExitAppHook(void *UserObj, int32 StubRetcode, uint32 CallCount,
const UT_StubContext_t *Context)
{
MM_AppData.HkTlm.Payload.CmdCounter++;

return 0;
}

void MM_AppMain_Test_Nominal(void) {
CFE_SB_Buffer_t Buf;
CFE_SB_Buffer_t *BufPtr = &Buf;
Expand Down Expand Up @@ -121,6 +129,32 @@ void MM_AppMain_Test_SBTimeout(void) {
UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1);
}

void MM_AppMain_Test_SBNoMessage(void)
{
size_t forced_Size = 1;
CFE_SB_MsgId_t forced_MsgID = MM_UT_MID_1;

/* Set to exit loop after first run */
UT_SetDeferredRetcode(UT_KEY(CFE_ES_RunLoop), 1, true);

/* Set to generate error message CFE_SB_NO_MESSAGE */
UT_SetDefaultReturnValue(UT_KEY(CFE_SB_ReceiveBuffer), CFE_SB_NO_MESSAGE);

/* Set to prevent segmentation fault */
UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &forced_MsgID, sizeof(forced_MsgID), false);
UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &forced_Size, sizeof(forced_Size), false);

/* Used to verify completion of MM_AppMain by incrementing MM_AppData.HkPacket.CmdCounter. */
UT_SetHookFunction(UT_KEY(CFE_ES_ExitApp), MM_APP_TEST_CFE_ES_ExitAppHook, NULL);

/* Execute the function being tested */
UtAssert_VOIDCALL(MM_AppMain());

/* Verify results */
/* Generates 1 event message we don't care about in this test */
UtAssert_STUB_COUNT(CFE_EVS_SendEvent, 1);
}

void MM_AppInit_Test_Nominal(void) {
CFE_Status_t Result;

Expand Down Expand Up @@ -271,6 +305,7 @@ void UtTest_Setup(void) {
ADD_TEST(MM_AppMain_Test_AppInitError);
ADD_TEST(MM_AppMain_Test_SBError);
ADD_TEST(MM_AppMain_Test_SBTimeout);
ADD_TEST(MM_AppMain_Test_SBNoMessage);
ADD_TEST(MM_AppInit_Test_Nominal);
ADD_TEST(MM_AppInit_Test_EVSRegisterError);
ADD_TEST(MM_AppInit_Test_SBCreatePipeError);
Expand Down
Loading