From 473e7d4bfce5b23ce506dc4b824d15f877256ff3 Mon Sep 17 00:00:00 2001 From: Alex Campbell Date: Thu, 5 Nov 2020 09:50:33 -0500 Subject: [PATCH 1/2] Fix #106, Refactor UT_SetForceFail (#107) New function name is UT_SetDefaultReturnValue --- unit-test/coveragetest/coveragetest_sample_app.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/unit-test/coveragetest/coveragetest_sample_app.c b/unit-test/coveragetest/coveragetest_sample_app.c index 01f499d..cc28b90 100644 --- a/unit-test/coveragetest/coveragetest_sample_app.c +++ b/unit-test/coveragetest/coveragetest_sample_app.c @@ -379,7 +379,7 @@ void Test_SAMPLE_APP_ProcessGroundCommand(void) * avoid dereferencing a table which does not exist. */ FcnCode = SAMPLE_APP_PROCESS_CC; Size = sizeof(TestMsg.Process); - UT_SetForceFail(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_ERR_UNREGISTERED); + UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_ERR_UNREGISTERED); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetFcnCode), &FcnCode, sizeof(FcnCode), false); UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &Size, sizeof(Size), false); @@ -513,7 +513,7 @@ void Test_SAMPLE_APP_ProcessCC(void) * Configure the CFE_TBL_GetAddress function to return an error * Exercise the error return path */ - UT_SetForceFail(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_ERR_UNREGISTERED); + UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_GetAddress), CFE_TBL_ERR_UNREGISTERED); UT_TEST_FUNCTION_RC(SAMPLE_APP_Process(&TestMsg), CFE_TBL_ERR_UNREGISTERED); } @@ -592,7 +592,7 @@ void Test_SAMPLE_APP_GetCrc(void) * the message using a hook function, if desired. */ - UT_SetForceFail(UT_KEY(CFE_TBL_GetInfo), CFE_TBL_ERR_INVALID_NAME); + UT_SetDefaultReturnValue(UT_KEY(CFE_TBL_GetInfo), CFE_TBL_ERR_INVALID_NAME); SAMPLE_APP_GetCrc("UT"); UtAssert_True(UT_GetStubCount(UT_KEY(CFE_ES_WriteToSysLog)) == 1, "CFE_ES_WriteToSysLog() called"); From 8fa65c98035d3b6e2b7e21a29080f15d40d7114b Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Wed, 2 Dec 2020 09:34:30 -0500 Subject: [PATCH 2/2] Bump to v1.2.0-rc1+dev25 Integration Candidate 2020-11-24 --- README.md | 6 ++++++ fsw/src/sample_app_version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f80346..34bd767 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,12 @@ sample_app is an example for how to build and link an application in cFS. See al ## Version History +### Development Build: 1.2.0-rc1+dev25 + +- Rename `UT_SetForceFail` to `UT_SetDefaultReturnValue` since some functions that retain more than 1 value are not necessarily failing +- See + + ### Development Build: 1.2.0-rc1+dev22 - Replaces deprecated SB API's with MSG diff --git a/fsw/src/sample_app_version.h b/fsw/src/sample_app_version.h index bddd550..406344d 100644 --- a/fsw/src/sample_app_version.h +++ b/fsw/src/sample_app_version.h @@ -32,7 +32,7 @@ /* Development Build Macro Definitions */ -#define SAMPLE_APP_BUILD_NUMBER 22 /*!< Development Build: Number of commits since baseline */ +#define SAMPLE_APP_BUILD_NUMBER 25 /*!< Development Build: Number of commits since baseline */ #define SAMPLE_APP_BUILD_BASELINE \ "v1.2.0-rc1" /*!< Development Build: git tag that is the base for the current development */