From ae95ec63333809f28ad15fdabd09eb9785d61083 Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Thu, 30 Mar 2023 14:59:50 +1000 Subject: [PATCH] Fix #1528, Move NO_SUCH_TABLE_ERR_EID into FindTableInRegistry and make optional --- cmake/sample_defs/cpu1_platform_cfg.h | 21 ++++++++ modules/tbl/fsw/src/cfe_tbl_internal.c | 8 ++++ modules/tbl/fsw/src/cfe_tbl_task_cmds.c | 32 +------------ modules/tbl/ut-coverage/tbl_UT.c | 64 ++++++++++++------------- 4 files changed, 62 insertions(+), 63 deletions(-) diff --git a/cmake/sample_defs/cpu1_platform_cfg.h b/cmake/sample_defs/cpu1_platform_cfg.h index b898e7b37..12416edaf 100644 --- a/cmake/sample_defs/cpu1_platform_cfg.h +++ b/cmake/sample_defs/cpu1_platform_cfg.h @@ -1666,6 +1666,27 @@ #define CFE_PLATFORM_TBL_VALID_PRID_3 0 #define CFE_PLATFORM_TBL_VALID_PRID_4 0 +/** +** \cfeevscfg Define whether or not to send an event if table not found in registry +** +** \par Description: +** This configuration parameter sets whether or not to send an event if a table is +** not found in the registry when calling CFE_TBL_FindTableInRegistry. +** +** Note: If the table is not found, CFE_TBL_FindTableInRegistry returns +** CFE_TBL_NOT_FOUND, whether or not this configuration parameter is set to true. +** If the event reports are not needed, this parameter can therefore be set to +** false, and the implications of the table not being found can be handled via the +** return code. +** +** If set to true, an event will be sent with Event ID CFE_TBL_NO_SUCH_TABLE_ERR_EID. +** If set to false, no event will be sent. +** +** \par Limits +** The valid settings are true or false. +*/ +#define CFE_PLATFORM_TBL_SEND_EVENT_IF_TABLE_NOT_FOUND true + /** \cfeescfg Poll timer for startup sync delay ** ** \par Description: diff --git a/modules/tbl/fsw/src/cfe_tbl_internal.c b/modules/tbl/fsw/src/cfe_tbl_internal.c index bb72f3477..e9bfe79b2 100644 --- a/modules/tbl/fsw/src/cfe_tbl_internal.c +++ b/modules/tbl/fsw/src/cfe_tbl_internal.c @@ -503,6 +503,14 @@ int16 CFE_TBL_FindTableInRegistry(const char *TblName) } } while ((RegIndx == CFE_TBL_NOT_FOUND) && (i < (CFE_PLATFORM_TBL_MAX_NUM_TABLES - 1))); +#if (CFE_PLATFORM_TBL_SEND_EVENT_IF_TABLE_NOT_FOUND == true) + if (RegIndx == CFE_TBL_NOT_FOUND) + { + CFE_EVS_SendEvent(CFE_TBL_NO_SUCH_TABLE_ERR_EID, CFE_EVS_EventType_ERROR, + "Unable to locate '%s' in Table Registry", TblName); + } +#endif + return RegIndx; } diff --git a/modules/tbl/fsw/src/cfe_tbl_task_cmds.c b/modules/tbl/fsw/src/cfe_tbl_task_cmds.c index 5af3f9da6..7e03805d1 100644 --- a/modules/tbl/fsw/src/cfe_tbl_task_cmds.c +++ b/modules/tbl/fsw/src/cfe_tbl_task_cmds.c @@ -373,12 +373,7 @@ int32 CFE_TBL_LoadCmd(const CFE_TBL_LoadCmd_t *data) /* Locate specified table in registry */ RegIndex = CFE_TBL_FindTableInRegistry(TblFileHeader.TableName); - if (RegIndex == CFE_TBL_NOT_FOUND) - { - CFE_EVS_SendEvent(CFE_TBL_NO_SUCH_TABLE_ERR_EID, CFE_EVS_EventType_ERROR, - "Unable to locate '%s' in Table Registry", TblFileHeader.TableName); - } - else + if (RegIndex != CFE_TBL_NOT_FOUND) { /* Translate the registry index into a record pointer */ RegRecPtr = &CFE_TBL_Global.Registry[RegIndex]; @@ -660,11 +655,6 @@ int32 CFE_TBL_DumpCmd(const CFE_TBL_DumpCmd_t *data) } } } - else /* Table could not be found in Registry */ - { - CFE_EVS_SendEvent(CFE_TBL_NO_SUCH_TABLE_ERR_EID, CFE_EVS_EventType_ERROR, - "Unable to locate '%s' in Table Registry", TableName); - } return ReturnCode; } @@ -925,11 +915,6 @@ int32 CFE_TBL_ValidateCmd(const CFE_TBL_ValidateCmd_t *data) } } } - else /* Table could not be found in Registry */ - { - CFE_EVS_SendEvent(CFE_TBL_NO_SUCH_TABLE_ERR_EID, CFE_EVS_EventType_ERROR, - "Unable to locate '%s' in Table Registry", TableName); - } return ReturnCode; } @@ -1003,11 +988,6 @@ int32 CFE_TBL_ActivateCmd(const CFE_TBL_ActivateCmd_t *data) "Cannot activate table '%s'. No Inactive image available", TableName); } } - else /* Table could not be found in Registry */ - { - CFE_EVS_SendEvent(CFE_TBL_NO_SUCH_TABLE_ERR_EID, CFE_EVS_EventType_ERROR, - "Unable to locate '%s' in Table Registry", TableName); - } return ReturnCode; } @@ -1283,11 +1263,6 @@ int32 CFE_TBL_SendRegistryCmd(const CFE_TBL_SendRegistryCmd_t *data) /* Increment Successful Command Counter */ ReturnCode = CFE_TBL_INC_CMD_CTR; } - else /* Table could not be found in Registry */ - { - CFE_EVS_SendEvent(CFE_TBL_NO_SUCH_TABLE_ERR_EID, CFE_EVS_EventType_ERROR, - "Unable to locate '%s' in Table Registry", TableName); - } return ReturnCode; } @@ -1421,11 +1396,6 @@ int32 CFE_TBL_AbortLoadCmd(const CFE_TBL_AbortLoadCmd_t *data) "Cannot abort load of '%s'. No load started.", TableName); } } - else /* Table could not be found in Registry */ - { - CFE_EVS_SendEvent(CFE_TBL_NO_SUCH_TABLE_ERR_EID, CFE_EVS_EventType_ERROR, - "Unable to locate '%s' in Table Registry", TableName); - } return ReturnCode; } diff --git a/modules/tbl/ut-coverage/tbl_UT.c b/modules/tbl/ut-coverage/tbl_UT.c index 77db831f9..d040a1850 100644 --- a/modules/tbl/ut-coverage/tbl_UT.c +++ b/modules/tbl/ut-coverage/tbl_UT.c @@ -1472,7 +1472,7 @@ void Test_CFE_TBL_Register(void) CFE_TBL_Register(&TblHandle1, "UT_Table1", CFE_PLATFORM_TBL_MAX_SNGL_TABLE_SIZE, CFE_TBL_OPT_DEFAULT, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); CFE_UtAssert_SUCCESS(CFE_TBL_Unregister(TblHandle1)); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* Test response to a double-buffered table size larger than the * maximum allowed @@ -1490,7 +1490,7 @@ void Test_CFE_TBL_Register(void) CFE_TBL_Register(&TblHandle1, "UT_Table1", CFE_PLATFORM_TBL_MAX_DBL_TABLE_SIZE, CFE_TBL_OPT_DBL_BUFFER, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); CFE_UtAssert_SUCCESS(CFE_TBL_Unregister(TblHandle1)); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* Test response to an invalid table option combination * (CFE_TBL_OPT_USR_DEF_ADDR | CFE_TBL_OPT_DBL_BUFFER) @@ -1540,7 +1540,7 @@ void Test_CFE_TBL_Register(void) UtAssert_INT32_EQ(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_DEFAULT, NULL), CFE_ES_ERR_RESOURCEID_NOT_VALID); CFE_UtAssert_EVENTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(1); + CFE_UtAssert_EVENTCOUNT(2); /* Test response to a memory block size error */ UT_InitData(); @@ -1548,7 +1548,7 @@ void Test_CFE_TBL_Register(void) UtAssert_INT32_EQ(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_DEFAULT, NULL), CFE_ES_ERR_MEM_BLOCK_SIZE); CFE_UtAssert_EVENTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(1); + CFE_UtAssert_EVENTCOUNT(2); /* Test response to a memory block size error (for a second buffer) */ UT_InitData(); @@ -1556,13 +1556,13 @@ void Test_CFE_TBL_Register(void) UtAssert_INT32_EQ(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_DBL_BUFFER, NULL), CFE_ES_ERR_MEM_BLOCK_SIZE); CFE_UtAssert_EVENTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(1); + CFE_UtAssert_EVENTCOUNT(2); /* Test successfully getting a double buffered table */ UT_InitData(); CFE_UtAssert_SUCCESS(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_DBL_BUFFER, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* Test attempt to register table owned by another application */ UT_InitData(); @@ -1609,7 +1609,7 @@ void Test_CFE_TBL_Register(void) UT_SetAppID(UT_TBL_APPID_1); CFE_UtAssert_SUCCESS(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_DEFAULT, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Test cleanup: unregister table */ UT_ClearEventHistory(); @@ -1622,7 +1622,7 @@ void Test_CFE_TBL_Register(void) CFE_UtAssert_SUCCESS(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), (CFE_TBL_OPT_SNGL_BUFFER | CFE_TBL_OPT_DUMP_ONLY), NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Test cleanup: unregister table */ UT_ClearEventHistory(); @@ -1635,7 +1635,7 @@ void Test_CFE_TBL_Register(void) CFE_UtAssert_SUCCESS( CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_USR_DEF_ADDR, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Test cleanup: unregister table */ UT_ClearEventHistory(); @@ -1647,7 +1647,7 @@ void Test_CFE_TBL_Register(void) UT_InitData(); CFE_UtAssert_SUCCESS(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_CRITICAL, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Test cleanup: unregister table */ UT_ClearEventHistory(); @@ -1662,7 +1662,7 @@ void Test_CFE_TBL_Register(void) UtAssert_INT32_EQ(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_CRITICAL, NULL), CFE_TBL_INFO_RECOVERED_TBL); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Test cleanup: unregister table */ UT_ClearEventHistory(); @@ -1678,7 +1678,7 @@ void Test_CFE_TBL_Register(void) CFE_TBL_Global.CritReg[0].TableLoadedOnce = false; CFE_UtAssert_SUCCESS(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_CRITICAL, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Test cleanup: unregister table */ UT_ClearEventHistory(); @@ -1694,7 +1694,7 @@ void Test_CFE_TBL_Register(void) UT_SetDeferredRetcode(UT_KEY(CFE_ES_RestoreFromCDS), 1, CFE_ES_ERR_RESOURCEID_NOT_VALID); CFE_UtAssert_SUCCESS(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_CRITICAL, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Test cleanup: unregister table */ UT_ClearEventHistory(); @@ -1716,7 +1716,7 @@ void Test_CFE_TBL_Register(void) CFE_UtAssert_SUCCESS(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_CRITICAL, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Test cleanup: unregister table */ UT_ClearEventHistory(); @@ -1738,7 +1738,7 @@ void Test_CFE_TBL_Register(void) CFE_UtAssert_SUCCESS(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_CRITICAL, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Test cleanup: unregister table */ UT_ClearEventHistory(); @@ -1753,7 +1753,7 @@ void Test_CFE_TBL_Register(void) UtAssert_INT32_EQ(CFE_TBL_Register(&TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_CRITICAL, NULL), CFE_TBL_WARN_NOT_CRITICAL); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* Test attempt to register a table when the registry is full */ /* a. Test setup */ @@ -1775,7 +1775,7 @@ void Test_CFE_TBL_Register(void) UtAssert_INT32_EQ(CFE_TBL_Register(&TblHandle2, TblName, sizeof(UT_Table1_t), CFE_TBL_OPT_DEFAULT, NULL), CFE_TBL_ERR_REGISTRY_FULL); CFE_UtAssert_EVENTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(1); + CFE_UtAssert_EVENTCOUNT(2); /* c. Test cleanup: unregister table */ UT_ClearEventHistory(); @@ -1793,7 +1793,7 @@ void Test_CFE_TBL_Register(void) /* b. Perform test */ CFE_UtAssert_SUCCESS(CFE_TBL_Register(&TblHandle1, "NOTABLE", sizeof(UT_Table1_t), CFE_TBL_OPT_CRITICAL, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* c. Test cleanup: unregister table */ UT_ClearEventHistory(); @@ -1818,7 +1818,7 @@ void Test_CFE_TBL_Register(void) UtAssert_INT32_EQ(CFE_TBL_Register(&TblHandle1, TblName, sizeof(UT_Table1_t), CFE_TBL_OPT_DEFAULT, NULL), CFE_TBL_ERR_HANDLES_FULL); CFE_UtAssert_EVENTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(1); + CFE_UtAssert_EVENTCOUNT(2); /* Test response to an invalid table option combination * (CFE_TBL_OPT_USR_DEF_ADDR | CFE_TBL_OPT_CRITICAL) @@ -1917,7 +1917,7 @@ void Test_CFE_TBL_Share(void) UT_SetAppID(UT_TBL_APPID_1); UtAssert_INT32_EQ(CFE_TBL_Share(&App1TblHandle1, "ut_cfe_tbl.NOT_Table2"), CFE_TBL_ERR_INVALID_NAME); CFE_UtAssert_EVENTSENT(CFE_TBL_SHARE_ERR_EID); - CFE_UtAssert_EVENTCOUNT(1); + CFE_UtAssert_EVENTCOUNT(2); /* Test response when there are no available table handles */ UT_InitData(); @@ -2010,7 +2010,7 @@ void Test_CFE_TBL_NotifyByMessage(void) CFE_UtAssert_SUCCESS( CFE_TBL_Register(&App1TblHandle1, "NBMsg_Tbl", sizeof(UT_Table1_t), CFE_TBL_OPT_CRITICAL, NULL)); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* Test successful notification */ UT_InitData(); @@ -2062,7 +2062,7 @@ void Test_CFE_TBL_Load(void) CFE_UtAssert_SUCCESS(CFE_TBL_Register(&App1TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_DEFAULT, Test_CFE_TBL_ValidationFunc)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* Test response to a null source data pointer */ UT_InitData(); @@ -2127,7 +2127,7 @@ void Test_CFE_TBL_Load(void) CFE_UtAssert_SUCCESS(CFE_TBL_Register(&App1TblHandle2, "UT_Table2x", sizeof(UT_Table1_t), CFE_TBL_OPT_DBL_BUFFER, Test_CFE_TBL_ValidationFunc)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* Test attempt to load a file that has incompatible data for the * specified double buffered table that is already loaded @@ -2198,7 +2198,7 @@ void Test_CFE_TBL_Load(void) CFE_UtAssert_SUCCESS( CFE_TBL_Register(&DumpOnlyTblHandle, "UT_Table2", sizeof(UT_Table1_t), CFE_TBL_OPT_DUMP_ONLY, NULL)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Perform test */ UT_InitData(); @@ -2221,7 +2221,7 @@ void Test_CFE_TBL_Load(void) UT_InitData(); CFE_UtAssert_SUCCESS( CFE_TBL_Register(&UserDefTblHandle, "UT_Table3", sizeof(UT_Table1_t), CFE_TBL_OPT_USR_DEF_ADDR, NULL)); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* Perform test */ UT_InitData(); @@ -2317,7 +2317,7 @@ void Test_CFE_TBL_ReleaseAddress(void) CFE_UtAssert_SUCCESS(CFE_TBL_Register(&App1TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_DEFAULT, Test_CFE_TBL_ValidationFunc)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Perform test */ UT_InitData(); @@ -2340,7 +2340,7 @@ void Test_CFE_TBL_GetAddresses(void) CFE_UtAssert_SUCCESS(CFE_TBL_Register(&App1TblHandle2, "UT_Table2", sizeof(UT_Table1_t), CFE_TBL_OPT_DBL_BUFFER, Test_CFE_TBL_ValidationFunc)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Perform test */ UT_InitData(); @@ -3016,7 +3016,7 @@ void Test_CFE_TBL_GetInfo(void) /* Test response to attempt to get information on a non-existent table */ UT_InitData(); UtAssert_INT32_EQ(CFE_TBL_GetInfo(&TblInfo, "ut_cfe_tbl.UT_Table_Not"), CFE_TBL_ERR_INVALID_NAME); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); } /* @@ -3057,7 +3057,7 @@ void Test_CFE_TBL_TblMod(void) /* Test setup for CFE_TBL_Modified; register a non critical table */ CFE_UtAssert_SUCCESS( CFE_TBL_Register(&App1TblHandle1, "UT_Table1", sizeof(UT_Table1_t), CFE_TBL_OPT_CRITICAL, NULL)); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* b. Perform test */ UT_ClearEventHistory(); @@ -3123,7 +3123,7 @@ void Test_CFE_TBL_TblMod(void) /* Register a non critical table */ CFE_UtAssert_SUCCESS( CFE_TBL_Register(&App1TblHandle1, "UT_Table2", sizeof(UT_Table1_t), CFE_TBL_OPT_DEFAULT, NULL)); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* Reset the current table entry pointer to a previous table in order to * exercise the path where one of the application IDs don't match @@ -3160,7 +3160,7 @@ void Test_CFE_TBL_TblMod(void) CFE_UtAssert_SUCCESS(CFE_TBL_Load(App1TblHandle1, CFE_TBL_SRC_FILE, MyFilename)); CFE_UtAssert_EVENTSENT(CFE_TBL_LOAD_SUCCESS_INF_EID); - CFE_UtAssert_EVENTCOUNT(1); + CFE_UtAssert_EVENTCOUNT(2); /* * Notify Table Services that the table has been modified. Verify CRC has been @@ -3217,7 +3217,7 @@ void Test_CFE_TBL_Internal(void) CFE_UtAssert_SUCCESS(CFE_TBL_Register(&App1TblHandle2, "UT_Table3", sizeof(UT_Table1_t), CFE_TBL_OPT_DBL_BUFFER, Test_CFE_TBL_ValidationFunc)); CFE_UtAssert_EVENTNOTSENT(CFE_TBL_REGISTER_ERR_EID); - CFE_UtAssert_EVENTCOUNT(0); + CFE_UtAssert_EVENTCOUNT(1); /* Test successful initial load of double buffered table */ UT_InitData();