Skip to content
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

Jump to bottom

Fix #1819, Fix #1820, evs coverage test #1862

Merged
merged 2 commits into from
Aug 25, 2021
Merged

Fix #1819, Fix #1820, evs coverage test #1862

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
922e665
Fix #1819, Test EVS Filter Failures
zanzaben Aug 20, 2021
8e7bb8f
Fix #1820, Add LogOverflowCounter test.
zanzaben Aug 20, 2021
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
23 changes: 22 additions & 1 deletion modules/evs/ut-coverage/evs_UT.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,27 +515,42 @@ void Test_FilterRegistration(void)

CFE_UtAssert_SUCCESS(CFE_EVS_Register(filter, CFE_PLATFORM_EVS_MAX_EVENT_FILTERS + 1, CFE_EVS_EventFilter_BINARY));

CFE_EVS_Global.EVS_TlmPkt.Payload.MessageSendCounter = 0;

/* Send 1st information message, should get through */
UT_InitData();
CFE_UtAssert_SUCCESS(CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "OK"));
UtAssert_UINT32_EQ(CFE_EVS_Global.EVS_TlmPkt.Payload.MessageSendCounter, 1);
UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(CFE_SB_TransmitMsg)), 1);

/* Send 2nd information message, should be filtered */
UT_InitData();
CFE_UtAssert_SUCCESS(CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "FAILED"));
UtAssert_UINT32_EQ(CFE_EVS_Global.EVS_TlmPkt.Payload.MessageSendCounter, 1);
UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(CFE_SB_TransmitMsg)), 0);

/* Send last information message, which should cause filtering to lock */
UT_InitData();
FilterPtr = EVS_FindEventID(0, (EVS_BinFilter_t *)AppDataPtr->BinFilters);
FilterPtr->Count = CFE_EVS_MAX_FILTER_COUNT - 1;
CFE_UtAssert_SUCCESS(CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "OK"));
UtAssert_UINT32_EQ(CFE_EVS_Global.EVS_TlmPkt.Payload.MessageSendCounter, 3);
UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(CFE_SB_TransmitMsg)), 2);
UtAssert_UINT32_EQ(FilterPtr->Count, CFE_EVS_MAX_FILTER_COUNT);

/* Test that filter lock is applied */
UT_InitData();
CFE_UtAssert_SUCCESS(CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "FAILED"));
UtAssert_UINT32_EQ(CFE_EVS_Global.EVS_TlmPkt.Payload.MessageSendCounter, 3);
UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(CFE_SB_TransmitMsg)), 0);
UtAssert_UINT32_EQ(FilterPtr->Count, CFE_EVS_MAX_FILTER_COUNT);

/* Test that filter lock is (still) applied */
UT_InitData();
CFE_UtAssert_SUCCESS(CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "FAILED"));
UtAssert_UINT32_EQ(CFE_EVS_Global.EVS_TlmPkt.Payload.MessageSendCounter, 3);
UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(CFE_SB_TransmitMsg)), 0);
UtAssert_UINT32_EQ(FilterPtr->Count, CFE_EVS_MAX_FILTER_COUNT);

/* Return application to original state: re-register application */
UT_InitData();
Expand Down Expand Up @@ -813,7 +828,8 @@ void Test_Ports(void)
void Test_Logging(void)
{
int i;
uint32 resetAreaSize = 0;
uint32 resetAreaSize = 0;
uint16 LogOverflowCounterExpected = 1;
char tmpString[100];
union
{
Expand Down Expand Up @@ -857,6 +873,7 @@ void Test_Logging(void)

/* Test overfilling the log in discard mode */
UT_InitData();
UtAssert_VOIDCALL(EVS_ClearLog());

/* Ensure log is filled, then add one more, implicitly testing
* EVS_AddLog
Expand All @@ -870,15 +887,18 @@ void Test_Logging(void)
CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "Log overfill event discard");
UtAssert_BOOL_TRUE(CFE_EVS_Global.EVS_LogPtr->LogFullFlag);
UtAssert_UINT32_EQ(CFE_EVS_Global.EVS_LogPtr->LogMode, CFE_EVS_LogMode_DISCARD);
UtAssert_UINT32_EQ(CFE_EVS_Global.EVS_LogPtr->LogOverflowCounter, LogOverflowCounterExpected);

/* Test setting the logging mode to overwrite */
UT_InitData();
CmdBuf.modecmd.Payload.LogMode = CFE_EVS_LogMode_OVERWRITE;
UT_EVS_DoDispatchCheckEvents(&CmdBuf.modecmd, sizeof(CmdBuf.modecmd), UT_TPID_CFE_EVS_CMD_SET_LOG_MODE_CC,
&UT_EVS_EventBuf);
LogOverflowCounterExpected = CFE_EVS_Global.EVS_LogPtr->LogOverflowCounter + 1;
CFE_EVS_SendEvent(0, CFE_EVS_EventType_INFORMATION, "Log overfill event overwrite");
UtAssert_BOOL_TRUE(CFE_EVS_Global.EVS_LogPtr->LogFullFlag);
UtAssert_UINT32_EQ(CFE_EVS_Global.EVS_LogPtr->LogMode, CFE_EVS_LogMode_OVERWRITE);
UtAssert_UINT32_EQ(CFE_EVS_Global.EVS_LogPtr->LogOverflowCounter, LogOverflowCounterExpected);

/* Test sending a no op command */
UT_InitData();
Expand All @@ -891,6 +911,7 @@ void Test_Logging(void)
CFE_EVS_Global.EVS_TlmPkt.Payload.LogEnabled = true;
UT_EVS_DoDispatchCheckEvents(&CmdBuf.cmd, sizeof(CmdBuf.cmd), UT_TPID_CFE_EVS_CMD_CLEAR_LOG_CC, &UT_EVS_EventBuf);
UtAssert_BOOL_FALSE(CFE_EVS_Global.EVS_LogPtr->LogFullFlag);
UtAssert_UINT32_EQ(CFE_EVS_Global.EVS_LogPtr->LogOverflowCounter, 0);

/* Test setting the logging mode to overwrite */
UT_InitData();
Expand Down