From 4783578a536e507b7bfb9703019cc9cb5a2196a7 Mon Sep 17 00:00:00 2001 From: Alex Campbell Date: Mon, 4 Jan 2021 10:46:21 -0500 Subject: [PATCH] Fix #228, Refactor UT_ClearForceFail to UT_ClearDefaultReturnValue --- .../mcp750-vxworks/src/coveragetest-cfe-psp-start.c | 4 ++-- .../shared/src/coveragetest-cfe-psp-exceptionstorage.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c index 7215153b..e7334288 100644 --- a/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c +++ b/unit-test-coverage/mcp750-vxworks/src/coveragetest-cfe-psp-start.c @@ -79,14 +79,14 @@ void Test_OS_Application_Startup(void) UT_SetDefaultReturnValue(UT_KEY(OS_API_Init), OS_ERROR); UT_OS_Application_Startup(); UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(PCS_exit)), 1); - UT_ClearForceFail(UT_KEY(OS_API_Init)); + UT_ClearDefaultReturnValue(UT_KEY(OS_API_Init)); /* failure of OS_FileSysAddFixedMap - an extra OS_printf */ UT_SetDefaultReturnValue(UT_KEY(OS_FileSysAddFixedMap), OS_ERROR); UT_OS_Application_Startup(); UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(OS_printf)), 9); UtAssert_INT32_EQ(UT_GetStubCount(UT_KEY(PCS_SystemMain)), 2); - UT_ClearForceFail(UT_KEY(OS_FileSysAddFixedMap)); + UT_ClearDefaultReturnValue(UT_KEY(OS_FileSysAddFixedMap)); /* coverage for each of the reset types */ *PCS_SYS_REG_BLRR = PCS_SYS_REG_BLRR_PWRON; diff --git a/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c b/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c index 7cad3ae1..81afe414 100644 --- a/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c +++ b/unit-test-coverage/shared/src/coveragetest-cfe-psp-exceptionstorage.c @@ -113,7 +113,7 @@ void Test_CFE_PSP_Exception_GetSummary(void) CFE_PSP_Exception_WriteComplete(); UT_SetDefaultReturnValue(UT_KEY(OS_TaskFindIdBySystemData), OS_ERROR); UtAssert_INT32_EQ(CFE_PSP_Exception_GetSummary(&LogId, &TaskId, ReasonBuf, sizeof(ReasonBuf)), CFE_PSP_SUCCESS); - UT_ClearForceFail(UT_KEY(OS_TaskFindIdBySystemData)); + UT_ClearDefaultReturnValue(UT_KEY(OS_TaskFindIdBySystemData)); UtAssert_NONZERO(LogId); UtAssert_ZERO(OS_ObjectIdToInteger(TaskId));