Fix #2352, make shared tbl configurable

nasa · May 25, 2023 · 5bb5efe · 5bb5efe
1 parent b429d91
commit 5bb5efe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/modules/cfe_testcase/src/cfe_test.h b/modules/cfe_testcase/src/cfe_test.h
@@ -60,6 +60,14 @@ extern CFE_FT_Global_t CFE_FT_Global;
  */
 #define CFE_ASSERT_LOG_FILE_NAME "/cf/cfe_test.log"
 
+/**
+ * Name of the shared table used by CFE_TEST_APP for requirements verification
+ *
+ * This filename was made configurable such that projects can replace the
+ * sample app table with a project specific table for the purpose of CI/CD.
+ */
+#define SHARED_TABLE_NAME "SAMPLE_APP.SampleAppTable"
+
 void TimeInRange(CFE_TIME_SysTime_t Start, CFE_TIME_SysTime_t Time, CFE_TIME_SysTime_t Range, const char *Str);
 
 void CFE_TestMain(void);

diff --git a/modules/cfe_testcase/src/tbl_content_access_test.c b/modules/cfe_testcase/src/tbl_content_access_test.c
@@ -45,7 +45,7 @@ void TestGetAddress(void)
     TBL_TEST_Table_t  TestTable = {1, 2};
 
     CFE_TBL_Handle_t SharedTblHandle = CFE_TBL_BAD_TABLE_HANDLE;
-    const char *     SharedTblName   = "SAMPLE_APP.SampleAppTable";
+    const char *     SharedTblName   = SHARED_TABLE_NAME;
 
     UtPrintf("Testing: CFE_TBL_GetAddress");
 

diff --git a/modules/cfe_testcase/src/tbl_information_test.c b/modules/cfe_testcase/src/tbl_information_test.c
@@ -77,7 +77,7 @@ void TestGetInfo(void)
 void TestNotifyByMessage(void)
 {
     CFE_TBL_Handle_t  SharedTblHandle = CFE_TBL_BAD_TABLE_HANDLE;
-    const char *      SharedTblName   = "SAMPLE_APP.SampleAppTable";
+    const char *      SharedTblName   = SHARED_TABLE_NAME;
     CFE_SB_MsgId_t    TestMsgId       = CFE_SB_ValueToMsgId(CFE_TEST_CMD_MID);
     CFE_MSG_FcnCode_t TestCmdCode     = 0;
     uint32            TestParameter   = 0;

diff --git a/modules/cfe_testcase/src/tbl_registration_test.c b/modules/cfe_testcase/src/tbl_registration_test.c
@@ -190,7 +190,7 @@ void TestTableShare(void)
 {
     UtPrintf("Testing: CFE_TBL_Share");
     CFE_TBL_Handle_t SharedTblHandle;
-    const char *     SharedTblName = "SAMPLE_APP.SampleAppTable";
+    const char *     SharedTblName = SHARED_TABLE_NAME;
     const char *     BadTblName    = "SampleAppTable";
 
     UtAssert_INT32_EQ(CFE_TBL_Share(NULL, SharedTblName), CFE_TBL_BAD_ARGUMENT);