diff --git a/modules/core_private/ut-stubs/inc/ut_support.h b/modules/core_private/ut-stubs/inc/ut_support.h index 1aa67edc3..fa4683ba2 100644 --- a/modules/core_private/ut-stubs/inc/ut_support.h +++ b/modules/core_private/ut-stubs/inc/ut_support.h @@ -235,43 +235,6 @@ void UT_ResetCDS(void); /* Reset pool buffer array index */ void UT_ResetPoolBufferIndex(void); -/*****************************************************************************/ -/** -** \brief Output single test's pass/fail status -** -** \par Description -** Out the results and description for a single test, and update the -** pass/fail counters. -** -** \par Assumptions, External Events, and Notes: -** -** \param[in] test Equals 0 if the test failed; non-zero if the -** test passed -** -** \param[in] fun_name Character string pointer to the name of the function -** being tested -** -** \param[in] info Character string pointer to the description of the test -** -** \returns -** This function does not return a value. -** -******************************************************************************/ -void UT_Report(const char *file, uint32 line, bool test, const char *fun_name, const char *info); - -/*****************************************************************************/ -/** -** \brief Test pass/fail summary -** -** \par Description -** Output total number of tests passed and failed. -** -** \returns -** This function does not return a value. -** -******************************************************************************/ -void UT_ReportFailures(void); - /*****************************************************************************/ /** ** \brief Send a message via the software bus @@ -756,22 +719,6 @@ bool CFE_UtAssert_GenericSignedCompare_Impl(int32 ActualValue, CFE_UtAssert_Comp ******************************************************************************/ #define CFE_UtAssert_SUCCESS(FN) CFE_UtAssert_SuccessCheck_Impl(FN, UTASSERT_CASETYPE_FAILURE, __FILE__, __LINE__, #FN) -/*****************************************************************************/ -/** -** \brief Asserts the specific status code from the function being tested. -** -** \par Description -** The core of each unit test is the execution of the function being tested. -** This function and macro should be used to test for a specific status code -** from a function (typically an error case). -** -** \par Assumptions, External Events, and Notes: -** None -** -******************************************************************************/ -#define CFE_UtAssert_EQUAL(FN, EXP) \ - CFE_UtAssert_GenericSignedCompare_Impl(FN, CFE_UtAssert_Compare_EQ, EXP, __FILE__, __LINE__, "", #FN, #EXP) - /*****************************************************************************/ /** ** \brief Asserts the expression/function evaluates as logically true diff --git a/modules/core_private/ut-stubs/src/ut_support.c b/modules/core_private/ut-stubs/src/ut_support.c index b8820fb77..6ba1ac9b3 100644 --- a/modules/core_private/ut-stubs/src/ut_support.c +++ b/modules/core_private/ut-stubs/src/ut_support.c @@ -197,14 +197,6 @@ void UT_ResetPoolBufferIndex(void) UT_SetDataBuffer(UT_KEY(CFE_ES_GetPoolBuf), &UT_CFE_ES_MemoryPool, sizeof(UT_CFE_ES_MemoryPool), false); } -/* -** Output single test's pass/fail status -*/ -void UT_Report(const char *file, uint32 line, bool test, const char *fun_name, const char *info) -{ - UtAssertEx(test, UtAssert_GetContext(), file, line, "%s - %s", fun_name, info); -} - /* ** Calls the specified "task pipe" function ** diff --git a/modules/fs/ut-coverage/fs_UT.h b/modules/fs/ut-coverage/fs_UT.h index e7f1fd747..fe823aeca 100644 --- a/modules/fs/ut-coverage/fs_UT.h +++ b/modules/fs/ut-coverage/fs_UT.h @@ -77,7 +77,7 @@ void Test_CFE_FS_API(void); ** \returns ** This function does not return a value. ** -** \sa #UT_Report, #CFE_FS_InitHeader +** \sa #CFE_FS_InitHeader ** ******************************************************************************/ void Test_CFE_FS_InitHeader(void); @@ -95,7 +95,7 @@ void Test_CFE_FS_InitHeader(void); ** \returns ** This function does not return a value. ** -** \sa #UT_InitData, #UT_SetOSFail, #UT_Report, #CFE_FS_ReadHeader, +** \sa #UT_InitData, #UT_SetOSFail, #CFE_FS_ReadHeader, ** \sa #UT_SetRtnCode ** ******************************************************************************/ @@ -114,7 +114,7 @@ void Test_CFE_FS_ReadHeader(void); ** \returns ** This function does not return a value. ** -** \sa #UT_InitData, #UT_SetOSFail, #UT_Report, #CFE_FS_WriteHeader, +** \sa #UT_InitData, #UT_SetOSFail, #CFE_FS_WriteHeader, ** \sa #UT_SetRtnCode ** ******************************************************************************/ @@ -149,7 +149,7 @@ void Test_CFE_FS_DefaultFileStrings(void); ** \returns ** This function does not return a value. ** -** \sa #UT_InitData, #UT_SetOSFail, #UT_Report, #CFE_FS_SetTimestamp, +** \sa #UT_InitData, #UT_SetOSFail, #CFE_FS_SetTimestamp, ** \sa #UT_SetRtnCode ** ******************************************************************************/ @@ -168,7 +168,7 @@ void Test_CFE_FS_SetTimestamp(void); ** \returns ** This function does not return a value. ** -** \sa #UT_InitData, #CFE_FS_ByteSwapCFEHeader, #UT_Report +** \sa #UT_InitData, #CFE_FS_ByteSwapCFEHeader ** ******************************************************************************/ void Test_CFE_FS_ByteSwapCFEHeader(void); @@ -186,7 +186,7 @@ void Test_CFE_FS_ByteSwapCFEHeader(void); ** \returns ** This function does not return a value. ** -** \sa #UT_InitData, #CFE_FS_ByteSwapUint32, #UT_Report +** \sa #UT_InitData, #CFE_FS_ByteSwapUint32 ** ******************************************************************************/ void Test_CFE_FS_ByteSwapUint32(void); @@ -204,7 +204,7 @@ void Test_CFE_FS_ByteSwapUint32(void); ** \returns ** This function does not return a value. ** -** \sa #UT_InitData, #UT_Report, #CFE_FS_IsGzFile +** \sa #UT_InitData, #CFE_FS_IsGzFile ** ******************************************************************************/ void Test_CFE_FS_IsGzFile(void); @@ -222,7 +222,7 @@ void Test_CFE_FS_IsGzFile(void); ** \returns ** This function does not return a value. ** -** \sa #UT_InitData, #UT_Report, #CFE_FS_ParseInputFileName +** \sa #UT_InitData, #CFE_FS_ParseInputFileName ** ******************************************************************************/ void Test_CFE_FS_ParseInputFileNameEx(void); @@ -240,7 +240,7 @@ void Test_CFE_FS_ParseInputFileNameEx(void); ** \returns ** This function does not return a value. ** -** \sa #UT_InitData, #UT_Report, #CFE_FS_ExtractFilenameFromPath +** \sa #UT_InitData, #CFE_FS_ExtractFilenameFromPath ** ******************************************************************************/ void Test_CFE_FS_ExtractFileNameFromPath(void); @@ -258,7 +258,7 @@ void Test_CFE_FS_ExtractFileNameFromPath(void); ** \returns ** This function does not return a value. ** -** \sa #UT_InitData, #UT_Report, #CFE_FS_EarlyInit, +** \sa #UT_InitData, #CFE_FS_EarlyInit, ** \sa #CFE_FS_LockSharedData, #UT_SetRtnCode, #CFE_FS_UnlockSharedData ** ******************************************************************************/ @@ -278,7 +278,7 @@ void Test_CFE_FS_Private(void); ** \returns ** This function does not return a value. ** -** \sa #UT_InitData, #UT_SetOSFail, #UT_Report, #CFE_FS_Decompress, +** \sa #UT_InitData, #UT_SetOSFail, #CFE_FS_Decompress, ** \sa #UT_SetReadBuffer, #FS_gz_inflate_fixed, #FS_gz_inflate_stored, ** \sa #FS_gz_fill_inbuf, #FS_gz_flush_window **