From f14fd68ec18558679c235cbde0e142f4b7226434 Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Thu, 29 Jul 2021 10:30:52 -0400 Subject: [PATCH 1/4] Fix #1120, add osapi-shell-stubs.c to OSAL stub library --- src/ut-stubs/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ut-stubs/CMakeLists.txt b/src/ut-stubs/CMakeLists.txt index 1fb0104fb..7f9643366 100644 --- a/src/ut-stubs/CMakeLists.txt +++ b/src/ut-stubs/CMakeLists.txt @@ -84,6 +84,7 @@ add_library(ut_osapi_stubs STATIC osapi-queue-stubs.c osapi-queue-handlers.c osapi-select-stubs.c + osapi-shell-stubs.c osapi-sockets-stubs.c osapi-sockets-handlers.c osapi-task-stubs.c @@ -105,6 +106,3 @@ target_include_directories(ut_osapi_stubs PRIVATE # These stubs must always link to UT Assert. # This also implicitly adds the path to the UT Assert header files. target_link_libraries(ut_osapi_stubs ut_assert) - - - From 548c2fc34d027fd8725ea5a104a820b004b9ac86 Mon Sep 17 00:00:00 2001 From: "Jose F. Martinez Pedraza" Date: Thu, 29 Jul 2021 11:18:31 -0400 Subject: [PATCH 2/4] Fix #1118 Add UtAssert_MIR macro --- src/tests/select-test/select-test.c | 6 ++---- src/unit-tests/inc/ut_os_support.h | 4 ++-- ut_assert/inc/utassert.h | 5 +++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/tests/select-test/select-test.c b/src/tests/select-test/select-test.c index 688d7f6ee..520ba6e21 100644 --- a/src/tests/select-test/select-test.c +++ b/src/tests/select-test/select-test.c @@ -324,8 +324,7 @@ void TestSelectSingleWrite(void) if (!FillOutputBuffer(c1_socket_id)) { - UtAssertEx(false, UTASSERT_CASETYPE_MIR, __FILE__, __LINE__, "%s", - "Unable to fill buffer with large looped writes, skipping verification"); + UtAssert_MIR("%s", "Unable to fill buffer with large looped writes, skipping verification"); } else { @@ -379,8 +378,7 @@ void TestSelectMultipleWrite(void) if (!FillOutputBuffer(c1_socket_id)) { - UtAssertEx(false, UTASSERT_CASETYPE_MIR, __FILE__, __LINE__, "%s", - "Unable to fill buffer with large looped writes, skipping verification"); + UtAssert_MIR("Unable to fill buffer with large looped writes, skipping verification"); } else { diff --git a/src/unit-tests/inc/ut_os_support.h b/src/unit-tests/inc/ut_os_support.h index 02af50308..6eaaaaea8 100644 --- a/src/unit-tests/inc/ut_os_support.h +++ b/src/unit-tests/inc/ut_os_support.h @@ -82,7 +82,7 @@ static inline bool UtOsalNotSuccess(int32 Fn, UtAssert_CaseType_t casetype, cons static inline bool UtManualInspectionWithStatus(int32 Fn, const char *File, uint32 Line, const char *FnTxt) { - UtAssertEx(false, UTASSERT_CASETYPE_MIR, File, Line, "%s value=%d", FnTxt, (int)Fn); + UtAssert_MIR("%s value=%d", FnTxt, (int)Fn); return (Fn >= 0); } @@ -117,7 +117,7 @@ static inline bool UtOsalImplemented(int32 Fn, const char *File, uint32 Line) #define UT_NOT_SUCCESS(Fn) UtOsalNotSuccess(Fn, UTASSERT_CASETYPE_FAILURE, __FILE__, __LINE__, #Fn) #define UT_MIR_STATUS(Fn) UtManualInspectionWithStatus(Fn, __FILE__, __LINE__, #Fn) -#define UT_MIR_VOID(Fn) Fn, UtAssertEx(false, UTASSERT_CASETYPE_MIR, __FILE__, __LINE__, "%s", #Fn) +#define UT_MIR_VOID(Fn) Fn, UtAssert_MIR("%s", #Fn) #define UT_SETUP(Fn) UtOsalCheck(Fn, UTASSERT_CASETYPE_TSF, __FILE__, __LINE__, #Fn) #define UT_TEARDOWN(Fn) UtOsalCheck(Fn, UTASSERT_CASETYPE_TTF, __FILE__, __LINE__, #Fn) diff --git a/ut_assert/inc/utassert.h b/ut_assert/inc/utassert.h index 6f303fa83..9c25fc9d1 100644 --- a/ut_assert/inc/utassert.h +++ b/ut_assert/inc/utassert.h @@ -110,6 +110,11 @@ typedef struct */ #define UtAssert_NA(...) UtAssertEx(false, UTASSERT_CASETYPE_NA, __FILE__, __LINE__, __VA_ARGS__) +/** + * \brief Assert a test MIR (Manual Inspection Required) + */ +#define UtAssert_MIR(...) UtAssertEx(false, UTASSERT_CASETYPE_MIR, __FILE__, __LINE__, __VA_ARGS__) + /** * \brief Compares two integers and determines if they are equal within a specified absolute tolerance. */ From ecd276bb2c404ae6c4747f55e250108c3fe2670c Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Fri, 30 Jul 2021 13:16:25 -0400 Subject: [PATCH 3/4] Fix #1124, add generic asserts from CFE coverage testing Migrates some of the assert extensions that were added for CFE coverage testing to the UtAssert level, so they can be used in a wider scope of tests, not just CFE coverage. The existing macros (e.g. UtAssert_INT32_EQ) are updated to use the same facility. All macros are now also a single line and return the boolean pass/fail status, which was a useful feature of the CFE macros. --- ut_assert/inc/utassert.h | 368 +++++++++++++++++++++++++++++++++------ ut_assert/inc/uttest.h | 19 ++ ut_assert/src/utassert.c | 263 ++++++++++++++++++++++++++++ ut_assert/src/uttest.c | 46 +++++ 4 files changed, 641 insertions(+), 55 deletions(-) diff --git a/ut_assert/inc/utassert.h b/ut_assert/inc/utassert.h index 6f303fa83..e7dca434e 100644 --- a/ut_assert/inc/utassert.h +++ b/ut_assert/inc/utassert.h @@ -68,6 +68,44 @@ typedef enum UTASSERT_CASETYPE_MAX /**< Reserved value, No messages should be used with this */ } UtAssert_CaseType_t; +/** + * \brief Comparison types for generic value asserts + * + * These constants are used with the generic value assert functions + * and indicate the type of comparison to perform + * + * \sa UtAssert_GenericSignedCompare + * \sa UtAssert_GenericUnsignedCompare + */ +typedef enum +{ + UtAssert_Compare_NONE, /**< invalid/not used, always false */ + UtAssert_Compare_EQ, /**< actual equals reference value */ + UtAssert_Compare_NEQ, /**< actual does not non equal reference value */ + UtAssert_Compare_LT, /**< actual less than reference (exclusive) */ + UtAssert_Compare_GT, /**< actual greater than reference (exclusive) */ + UtAssert_Compare_LTEQ, /**< actual less than or equal to reference (inclusive) */ + UtAssert_Compare_GTEQ, /**< actual greater than reference (inclusive) */ + UtAssert_Compare_MAX /**< placeholder, not used */ +} UtAssert_Compare_t; + +/** + * \brief Preferred print radix for generic value asserts + * + * These constants are used with the generic value assert functions + * and indicate the preferred format for printing integers in assert messages + * + * \sa UtAssert_GenericSignedCompare + * \sa UtAssert_GenericUnsignedCompare + */ +typedef enum +{ + UtAssert_Radix_DEFAULT = 0, /**< no preference, use default */ + UtAssert_Radix_OCTAL = 8, /**< log integers as octal, base 8 */ + UtAssert_Radix_DECIMAL = 10, /**< log integers as decimal, base 10 */ + UtAssert_Radix_HEX = 16 /**< log integers as hexadecimal, base 16 */ +} UtAssert_Radix_t; + /** * Test Counter object * Summarizes counters for all case types @@ -179,92 +217,256 @@ typedef struct UtAssertEx(Expression, UTASSERT_CASETYPE_##Type, __FILE__, __LINE__, __VA_ARGS__) /** - * \brief Compare addresses for equality with an auto-generated description message + * \brief Asserts the expression/function evaluates as logically true + * + * \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 function or value/expression + * that should evaluate as logically true + * + * \par Assumptions, External Events, and Notes: + * None + */ +#define UtAssert_BOOL_TRUE(expr) \ + UtAssert_GenericUnsignedCompare((bool)(expr), UtAssert_Compare_EQ, true, UtAssert_Radix_DECIMAL, __FILE__, \ + __LINE__, "", #expr, "true") + +/** + * \brief Asserts the expression/function evaluates as logically false + * + * \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 function or value/expression + * that should evaluate as logically false + * + * \par Assumptions, External Events, and Notes: + * None + * */ -#define UtAssert_ADDRESS_EQ(actual, expect) \ - do \ - { \ - void *exp = (void *)(expect); \ - void *act = (void *)(actual); \ - UtAssert_True(act == exp, "%s (%p) == %s (%p)", #actual, act, #expect, exp); \ - } while (0) +#define UtAssert_BOOL_FALSE(expr) \ + UtAssert_GenericUnsignedCompare((bool)(expr), UtAssert_Compare_EQ, false, UtAssert_Radix_DECIMAL, __FILE__, \ + __LINE__, "", #expr, "false") /** * \brief Compare two values for equality with an auto-generated description message + * + * This macro confirms that the given expression is equal to the reference value + * The generated log message will include the actual and reference values in decimal notation + * Values will be compared in an "int32" type context. + */ +#define UtAssert_INT32_EQ(actual, ref) \ + UtAssert_GenericSignedCompare((int32)(actual), UtAssert_Compare_EQ, (int32)(ref), UtAssert_Radix_DECIMAL, \ + __FILE__, __LINE__, "", #actual, #ref) + +/** + * \brief Compare two values for inequality with an auto-generated description message + * + * This macro confirms that the given expression is _not_ equal to the reference value + * The generated log message will include the actual and reference values in decimal notation * Values will be compared in an "int32" type context. */ -#define UtAssert_INT32_EQ(actual, expect) \ - do \ - { \ - int32 rcexp = (int32)(expect); \ - int32 rcact = (int32)(actual); \ - UtAssert_True(rcact == rcexp, "%s (%ld) == %s (%ld)", #actual, (long)rcact, #expect, (long)rcexp); \ - } while (0) +#define UtAssert_INT32_NEQ(actual, ref) \ + UtAssert_GenericSignedCompare((int32)(actual), UtAssert_Compare_NEQ, (int32)(ref), UtAssert_Radix_DECIMAL, \ + __FILE__, __LINE__, "", #actual, #ref) + +/** + * \brief Asserts the minimum value of a given function or expression + * + * This macro confirms that the given expression is at least the minimum value (inclusive) + * The generated log message will include the actual and reference values in decimal notation + * Values will be compared in an "int32" type context. + * + * \par Assumptions, External Events, and Notes: + * None + * + */ +#define UtAssert_INT32_GTEQ(expr, ref) \ + UtAssert_GenericSignedCompare((int32)(expr), UtAssert_Compare_GTEQ, (int32)(ref), UtAssert_Radix_DECIMAL, \ + __FILE__, __LINE__, "", #expr, #ref) + +/** + * \brief Asserts the maximum value of a given function or expression + * + * This macro confirms that the given expression is at most the maximum value (inclusive) + * The generated log message will include the actual and reference values in decimal notation + */ +#define UtAssert_INT32_LTEQ(expr, ref) \ + UtAssert_GenericSignedCompare((int32)(expr), UtAssert_Compare_LTEQ, (int32)(ref), UtAssert_Radix_DECIMAL, \ + __FILE__, __LINE__, "", #expr, #ref) + +/** + * \brief Asserts the value of a given function or expression is less than the reference value + * + * This macro confirms that the given expression is less than the maximum value (exclusive) + * The generated log message will include the actual and reference values in decimal notation + */ +#define UtAssert_INT32_LT(expr, ref) \ + UtAssert_GenericSignedCompare((int32)(expr), UtAssert_Compare_LT, (int32)(ref), UtAssert_Radix_DECIMAL, __FILE__, \ + __LINE__, "", #expr, #ref) + +/** + * \brief Asserts the value of a given function or expression is greater than the reference value + * + * This macro confirms that the given expression is greater than the minimum value (exclusive) + * The generated log message will include the actual and reference values in decimal notation + */ +#define UtAssert_INT32_GT(expr, ref) \ + UtAssert_GenericSignedCompare((int32)(expr), UtAssert_Compare_GT, (int32)(ref), UtAssert_Radix_DECIMAL, __FILE__, \ + __LINE__, "", #expr, #ref) /** * \brief Compare two values for equality with an auto-generated description message + * + * This macro confirms that the given expression is equal to the reference value + * The generated log message will include the actual and reference values in decimal notation + * Values will be compared in an "uint32" type context. + */ +#define UtAssert_UINT32_EQ(actual, ref) \ + UtAssert_GenericUnsignedCompare((uint32)(actual), UtAssert_Compare_EQ, (uint32)(ref), UtAssert_Radix_DECIMAL, \ + __FILE__, __LINE__, "", #actual, #ref) + +/** + * \brief Compare two values for inequality with an auto-generated description message + * + * This macro confirms that the given expression is _not_ equal to the reference value + * The generated log message will include the actual and reference values in decimal notation * Values will be compared in an "uint32" type context. */ -#define UtAssert_UINT32_EQ(actual, expect) \ - do \ - { \ - uint32 rcexp = (uint32)(expect); \ - uint32 rcact = (uint32)(actual); \ - UtAssert_True(rcact == rcexp, "%s (%lu) == %s (%lu)", #actual, (unsigned long)rcact, #expect, \ - (unsigned long)rcexp); \ - } while (0) +#define UtAssert_UINT32_NEQ(actual, ref) \ + UtAssert_GenericUnsignedCompare((uint32)(actual), UtAssert_Compare_NEQ, (uint32)(ref), UtAssert_Radix_DECIMAL, \ + __FILE__, __LINE__, "", #actual, #ref) + +/** + * \brief Asserts the minimum value of a given function or expression + * + * \par Description + * This macro confirms that the given expression is at least the minimum value (inclusive) + * + * \par Assumptions, External Events, and Notes: + * None + * + */ +#define UtAssert_UINT32_GTEQ(expr, ref) \ + UtAssert_GenericUnsignedCompare((uint32)(expr), UtAssert_Compare_GTEQ, (uint32)(ref), UtAssert_Radix_DECIMAL, \ + __FILE__, __LINE__, "", #expr, #ref) + +/** + * \brief Asserts the maximum value of a given function or expression + * + * \par Description + * This macro confirms that the given expression is at most the maximum value (inclusive) + * + * \par Assumptions, External Events, and Notes: + * None + * + */ +#define UtAssert_UINT32_LTEQ(expr, ref) \ + UtAssert_GenericUnsignedCompare((uint32)(expr), UtAssert_Compare_LTEQ, (uint32)(ref), UtAssert_Radix_DECIMAL, \ + __FILE__, __LINE__, "", #expr, #ref) + +/** + * \brief Asserts the value of a given function or expression is less than the reference value + * + * \par Description + * This macro confirms that the given expression is less than the maximum value (exclusive) + * + * \par Assumptions, External Events, and Notes: + * None + * + */ +#define UtAssert_UINT32_LT(expr, ref) \ + UtAssert_GenericUnsignedCompare((uint32)(expr), UtAssert_Compare_LT, (uint32)(ref), UtAssert_Radix_DECIMAL, \ + __FILE__, __LINE__, "", #expr, #ref) + +/** + * \brief Asserts the value of a given function or expression is greater than the reference value + * + * \par Description + * This macro confirms that the given expression is greater than the minimum value (exclusive) + * + * \par Assumptions, External Events, and Notes: + * None + * + */ +#define UtAssert_UINT32_GT(expr, ref) \ + UtAssert_GenericUnsignedCompare((uint32)(expr), UtAssert_Compare_GT, (uint32)(ref), UtAssert_Radix_DECIMAL, \ + __FILE__, __LINE__, "", #expr, #ref) + +/** + * \brief Macro for logging calls to a "void" function + * + * \par Description + * A macro that invokes a function with no return value. This should be used when + * no actual condition/result to check for/assert on, but the call should still be + * logged to the output to record the fact that the function was invoked. + * + * \par Assumptions, External Events, and Notes: + * None + * + */ +#define UtAssert_VOIDCALL(func) (func, UtAssert(true, #func, __FILE__, __LINE__)) + +/** + * \brief Macro to check string buffers for equality + * + * \par Description + * A macro that checks two string buffers for equality. Both buffer maximum sizes are explicitly + * specified, so that strings may reside in a fixed length buffer. The function will never + * check beyond the specified length, regardless of termination. + * + * \par Assumptions, External Events, and Notes: + * The generic #UtAssert_StrCmp macro requires both arguments to be NULL terminated. This also + * includes the actual string in the log, but filters embedded newlines to keep the log clean. + * + * If the string arguments are guaranteed to be NULL terminated and/or the max size is + * not known, then the SIZE_MAX constant may be passed for the respective string. + * + */ +#define UtAssert_STRINGBUF_EQ(str1, size1, str2, size2) \ + UtAssert_StringBufCompare(str1, size1, str2, size2, UtAssert_Compare_EQ, __FILE__, __LINE__) + +/** + * \brief Compare addresses for equality with an auto-generated description message + */ +#define UtAssert_ADDRESS_EQ(actual, expect) \ + UtAssert_GenericUnsignedCompare((unsigned long)(void *)(actual), UtAssert_Compare_EQ, \ + (unsigned long)(void *)(expect), UtAssert_Radix_HEX, __FILE__, __LINE__, "", \ + #actual, #expect) /** * \brief Confirm a pointer value is not NULL */ -#define UtAssert_NOT_NULL(actual) \ - do \ - { \ - void *ptr = (void *)(actual); \ - UtAssert_True(ptr != NULL, "%s (%p) != NULL", #actual, ptr); \ - } while (0) +#define UtAssert_NOT_NULL(actual) \ + UtAssert_GenericUnsignedCompare((unsigned long)(void *)(actual), UtAssert_Compare_NEQ, 0, UtAssert_Radix_HEX, \ + __FILE__, __LINE__, "", #actual, "NULL") /** * \brief Confirm a pointer value is NULL */ -#define UtAssert_NULL(actual) \ - do \ - { \ - void *ptr = (void *)(actual); \ - UtAssert_True(ptr == NULL, "%s (%p) == NULL", #actual, ptr); \ - } while (0) +#define UtAssert_NULL(actual) \ + UtAssert_GenericUnsignedCompare((unsigned long)(void *)(actual), UtAssert_Compare_EQ, 0, UtAssert_Radix_HEX, \ + __FILE__, __LINE__, "", #actual, "NULL") /** * \brief Confirm an integer value is nonzero */ -#define UtAssert_NONZERO(actual) \ - do \ - { \ - long val = (long)(actual); \ - UtAssert_True(val != 0, "%s (%ld) != 0", #actual, val); \ - } while (0) +#define UtAssert_NONZERO(actual) \ + UtAssert_GenericSignedCompare(actual, UtAssert_Compare_NEQ, 0, UtAssert_Radix_DECIMAL, __FILE__, __LINE__, "", \ + #actual, "ZERO") /** * \brief Confirm an integer value is zero */ -#define UtAssert_ZERO(actual) \ - do \ - { \ - long val = (long)(actual); \ - UtAssert_True(val == 0, "%s (%ld) == 0", #actual, val); \ - } while (0) +#define UtAssert_ZERO(actual) \ + UtAssert_GenericSignedCompare(actual, UtAssert_Compare_EQ, 0, UtAssert_Radix_DECIMAL, __FILE__, __LINE__, "", \ + #actual, "ZERO") /** * \brief Confirm that a stub function has been invoked the expected number of times */ -#define UtAssert_STUB_COUNT(stub, expected) \ - do \ - { \ - uint32 expval = (uint32)(expected); \ - uint32 actval = UT_GetStubCount(UT_KEY(stub)); \ - UtAssert_True(actval == expval, "%s() count (%lu) == %s (%lu)", #stub, (unsigned long)actval, #expected, \ - (unsigned long)expval); \ - } while (0) +#define UtAssert_STUB_COUNT(stub, expected) \ + UtAssert_GenericSignedCompare(UT_GetStubCount(UT_KEY(stub)), UtAssert_Compare_EQ, expected, \ + UtAssert_Radix_DECIMAL, __FILE__, __LINE__, "CallCount", #stub "()", #expected) /* * Exported Functions @@ -430,4 +632,60 @@ void UtAssert_DoReport(const char *File, uint32 LineNum, uint32 SegmentNum, uint */ void UtAssert_DoTestSegmentReport(const char *SegmentName, const UtAssert_TestCounter_t *TestCounters); +/** + * \brief Helper function for string buffer check verifications + * + * \par Description + * This helper function wraps the normal UtAssert function, intended for verifying + * the contents of string buffer(s). This also includes the actual message in the log, + * but scrubs it for newlines and other items that may affect the ability to parse + * the log file via a script. + * + * \par Assumptions, External Events, and Notes: + * None + * + * \returns Test pass status, returns true if status was successful, false if it failed. + * + */ +bool UtAssert_StringBufCompare(const char *String1, size_t String1Max, const char *String2, size_t String2Max, + UtAssert_Compare_t CompareType, const char *File, uint32 Line); + +/** + * \brief Helper function for generic unsigned integer value checks + * + * \par Description + * This helper function wraps the normal UtAssertEx() function, to compare two + * integer values in an unsigned context. The comparison is performed as two + * unsigned long integers and the numeric values are printed to the test log + * in hexadecimal notation (base-16). + * + * \par Assumptions, External Events, and Notes: + * None + * + * \returns Test pass status, returns true if status was successful, false if it failed. + * + */ +bool UtAssert_GenericUnsignedCompare(unsigned long ActualValue, UtAssert_Compare_t CompareType, + unsigned long ReferenceValue, UtAssert_Radix_t RadixType, const char *File, + uint32 Line, const char *Desc, const char *ActualText, const char *ReferenceText); + +/** + * \brief Helper function for generic signed integer value checks + * + * \par Description + * This helper function wraps the normal UtAssertEx() function, to compare two + * integer values in a signed context. The comparison is performed as two + * signed long integers and the numeric values are printed to the test log + * in standard decimal notation (base-10). + * + * \par Assumptions, External Events, and Notes: + * None + * + * \returns Test pass status, returns true if status was successful, false if it failed. + * + */ +bool UtAssert_GenericSignedCompare(long ActualValue, UtAssert_Compare_t CompareType, long ReferenceValue, + UtAssert_Radix_t RadixType, const char *File, uint32 Line, const char *Desc, + const char *ActualText, const char *ReferenceText); + #endif /* UTASSERT_H */ diff --git a/ut_assert/inc/uttest.h b/ut_assert/inc/uttest.h index 1e27a1e3f..aba937de2 100644 --- a/ut_assert/inc/uttest.h +++ b/ut_assert/inc/uttest.h @@ -77,6 +77,25 @@ void UtTest_AddSetup(void (*Setup)(void), const char *SequenceName); */ void UtTest_AddTeardown(void (*Teardown)(void), const char *SequenceName); +/** + * \brief Add a test as a member of a subgroup. + * + * Allow tests to be grouped together + * + * This is just a wrapper around UtTest_Add() that registers + * a test with a "GroupName.TestName" convention. Purely an + * organizational/identification helper for units which have + * lots of tests. + * + * \param Test Main test function to call. + * \param Setup Setup function, called before the test function + * \param Teardown Cleanup function, called after the test function + * \param GroupName Name of group for logging purposes + * \param TestName Name of test for logging purposes + */ +void UtTest_AddSubTest(void (*Test)(void), void (*Setup)(void), void (*Teardown)(void), const char *GroupName, + const char *TestName); + /** * \brief Early initialization function * diff --git a/ut_assert/src/utassert.c b/ut_assert/src/utassert.c index 09be48c4a..5fd6aa736 100644 --- a/ut_assert/src/utassert.c +++ b/ut_assert/src/utassert.c @@ -257,3 +257,266 @@ void UtAssert_Message(uint8 MessageType, const char *File, uint32 Line, const ch UT_BSP_DoText(MessageType, FinalMessage); } + +const char *UtAssert_GetOpText(UtAssert_Compare_t CompareType) +{ + const char *OpText; + + switch (CompareType) + { + case UtAssert_Compare_EQ: /* actual equals reference value */ + OpText = "=="; + break; + case UtAssert_Compare_NEQ: /* actual does not non equal reference value */ + OpText = "!="; + break; + case UtAssert_Compare_LT: /* actual less than reference (exclusive) */ + OpText = "<"; + break; + case UtAssert_Compare_GT: /* actual greater than reference (exclusive) */ + OpText = ">"; + break; + case UtAssert_Compare_LTEQ: /* actual less than or equal to reference (inclusive) */ + OpText = "<="; + break; + case UtAssert_Compare_GTEQ: /* actual greater than reference (inclusive) */ + OpText = ">="; + break; + default: /* should never happen */ + OpText = "??"; + break; + } + + return OpText; +} + +bool UtAssert_GenericUnsignedCompare(unsigned long ActualValue, UtAssert_Compare_t CompareType, + unsigned long ReferenceValue, UtAssert_Radix_t RadixType, const char *File, + uint32 Line, const char *Desc, const char *ActualText, const char *ReferenceText) +{ + bool Result; + const char *FormatStr; + + switch (CompareType) + { + case UtAssert_Compare_EQ: /* actual equals reference value */ + Result = (ActualValue == ReferenceValue); + break; + case UtAssert_Compare_NEQ: /* actual does not non equal reference value */ + Result = (ActualValue != ReferenceValue); + break; + case UtAssert_Compare_LT: /* actual less than reference (exclusive) */ + Result = (ActualValue < ReferenceValue); + break; + case UtAssert_Compare_GT: /* actual greater than reference (exclusive) */ + Result = (ActualValue > ReferenceValue); + break; + case UtAssert_Compare_LTEQ: /* actual less than or equal to reference (inclusive) */ + Result = (ActualValue <= ReferenceValue); + break; + case UtAssert_Compare_GTEQ: /* actual greater than reference (inclusive) */ + Result = (ActualValue >= ReferenceValue); + break; + default: /* should never happen */ + Result = false; + break; + } + + switch (RadixType) + { + case UtAssert_Radix_OCTAL: + FormatStr = "%s%s (0%lo) %s %s (0%lo)"; + break; + case UtAssert_Radix_DECIMAL: + FormatStr = "%s%s (%lu) %s %s (%lu)"; + break; + default: + /* for unsigned, default is hex */ + FormatStr = "%s%s (0x%lx) %s %s (0x%lx)"; + break; + } + + return UtAssertEx(Result, UTASSERT_CASETYPE_FAILURE, File, Line, FormatStr, Desc, ActualText, ActualValue, + UtAssert_GetOpText(CompareType), ReferenceText, ReferenceValue); +} + +bool UtAssert_GenericSignedCompare(long ActualValue, UtAssert_Compare_t CompareType, long ReferenceValue, + UtAssert_Radix_t RadixType, const char *File, uint32 Line, const char *Desc, + const char *ActualText, const char *ReferenceText) +{ + bool Result; + const char *FormatStr; + + switch (CompareType) + { + case UtAssert_Compare_EQ: /* actual equals reference value */ + Result = (ActualValue == ReferenceValue); + break; + case UtAssert_Compare_NEQ: /* actual does not non equal reference value */ + Result = (ActualValue != ReferenceValue); + break; + case UtAssert_Compare_LT: /* actual less than reference (exclusive) */ + Result = (ActualValue < ReferenceValue); + break; + case UtAssert_Compare_GT: /* actual greater than reference (exclusive) */ + Result = (ActualValue > ReferenceValue); + break; + case UtAssert_Compare_LTEQ: /* actual less than or equal to reference (inclusive) */ + Result = (ActualValue <= ReferenceValue); + break; + case UtAssert_Compare_GTEQ: /* actual greater than reference (inclusive) */ + Result = (ActualValue >= ReferenceValue); + break; + default: /* should never happen */ + Result = false; + break; + } + + switch (RadixType) + { + case UtAssert_Radix_OCTAL: + FormatStr = "%s%s (0%lo) %s %s (0%lo)"; + break; + case UtAssert_Radix_HEX: + FormatStr = "%s%s (0x%lx) %s %s (0x%lx)"; + break; + default: + /* for signed, default is decimal */ + FormatStr = "%s%s (%ld) %s %s (%ld)"; + break; + } + + return UtAssertEx(Result, UTASSERT_CASETYPE_FAILURE, File, Line, FormatStr, Desc, ActualText, ActualValue, + UtAssert_GetOpText(CompareType), ReferenceText, ReferenceValue); +} + +bool UtAssert_StringBufCompare(const char *String1, size_t String1Max, const char *String2, size_t String2Max, + UtAssert_Compare_t CompareType, const char *File, uint32 Line) +{ + char ScrubbedString1[256]; + char ScrubbedString2[256]; + const char *EndPtr1; + const char *EndPtr2; + size_t FormatLen1; + size_t FormatLen2; + bool Result; + int Compare; + + /* Locate the actual end of both strings */ + if (String1 == NULL) + { + EndPtr1 = NULL; + } + else + { + EndPtr1 = memchr(String1, 0, String1Max); + } + + if (EndPtr1 != NULL) + { + FormatLen1 = EndPtr1 - String1; + } + else + { + FormatLen1 = String1Max; + } + + if (String2 == NULL) + { + EndPtr2 = NULL; + } + else + { + EndPtr2 = memchr(String2, 0, String2Max); + } + + if (EndPtr2 != NULL) + { + FormatLen2 = EndPtr2 - String2; + } + else + { + FormatLen2 = String2Max; + } + + if (FormatLen1 == 0 && FormatLen2 == 0) + { + /* Two empty strings are considered equal */ + Compare = 0; + } + else + { + /* Compare actual content based on the shorter of the two strings */ + if (FormatLen1 < FormatLen2) + { + Compare = memcmp(String1, String2, FormatLen1); + } + else + { + Compare = memcmp(String1, String2, FormatLen2); + } + + /* If initial content was the same, go by whichever is longer */ + if (Compare == 0) + { + /* + * If String1 is longer, compare should be positive (String1 > String2) + * If String2 is longer, compare should be negative (String1 < String2) + * If strings are the same length, compare should be 0. + */ + Compare = FormatLen1 - FormatLen2; + } + } + + switch (CompareType) + { + case UtAssert_Compare_EQ: /* actual equals reference value */ + Result = (Compare == 0); + break; + case UtAssert_Compare_NEQ: /* actual does not non equal reference value */ + Result = (Compare != 0); + break; + case UtAssert_Compare_LT: /* actual less than reference (exclusive) */ + Result = (Compare < 0); + break; + case UtAssert_Compare_GT: /* actual greater than reference (exclusive) */ + Result = (Compare > 0); + break; + case UtAssert_Compare_LTEQ: /* actual less than or equal to reference (inclusive) */ + Result = (Compare <= 0); + break; + case UtAssert_Compare_GTEQ: /* actual greater than reference (inclusive) */ + Result = (Compare >= 0); + break; + default: /* should never happen */ + Result = false; + break; + } + + /* Now make "safe" copies of the strings */ + /* Check for a newline within the string, and if present, end the string there instead */ + if (FormatLen1 > 0) + { + EndPtr1 = memchr(String1, '\n', FormatLen1); + if (EndPtr1 != NULL) + { + FormatLen1 = EndPtr1 - String1; + } + memcpy(ScrubbedString1, String1, FormatLen1); + } + ScrubbedString1[FormatLen1] = 0; + + if (FormatLen2 > 0) + { + EndPtr2 = memchr(String2, '\n', FormatLen2); + if (EndPtr2 != NULL) + { + FormatLen2 = EndPtr2 - String2; + } + memcpy(ScrubbedString2, String2, FormatLen2); + } + ScrubbedString2[FormatLen2] = 0; + + return UtAssertEx(Result, UTASSERT_CASETYPE_FAILURE, File, Line, "String: \'%s\' == \'%s\'", ScrubbedString1, + ScrubbedString2); +} diff --git a/ut_assert/src/uttest.c b/ut_assert/src/uttest.c index a2e8554d3..f96b6259e 100644 --- a/ut_assert/src/uttest.c +++ b/ut_assert/src/uttest.c @@ -82,6 +82,52 @@ void UtTest_AddTeardown(void (*Teardown)(void), const char *SequenceName) UtTest_AddCommon(NULL, NULL, Teardown, SequenceName, UTASSERT_GROUP_TEARDOWN); } +void UtTest_AddSubTest(void (*Test)(void), void (*Setup)(void), void (*Teardown)(void), const char *GroupName, + const char *TestName) +{ + char CompleteTestName[128]; + const char *GroupPtr; + const char *TestPtr; + + /* Remove any common prefix between the two names. + * They are often function names that all start with "Test_XXX" + * and this repetitive information just becomes clutter. + */ + GroupPtr = GroupName; + TestPtr = TestName; + while (*GroupPtr != 0 && *GroupPtr == *TestPtr) + { + ++GroupPtr; + ++TestPtr; + } + + /* + * Only break at an underscore(_) to avoid weird effects + */ + while (TestPtr > TestName && *TestPtr != '_') + { + --TestPtr; + } + if (*TestPtr == '_') + { + ++TestPtr; + } + + /* + * Remove a remaining "Test_" prefix on the group name. + * Again just to remove common repetitive content + */ + GroupPtr = GroupName; + if (strncmp(GroupPtr, "Test_", 5) == 0) + { + GroupPtr += 5; + } + + (void)snprintf(CompleteTestName, sizeof(CompleteTestName), "%s.%s", GroupPtr, TestPtr); + + UtTest_AddCommon(Test, Setup, Teardown, CompleteTestName, UTASSERT_GROUP_TEST); +} + void UtTest_Run(void) { UtListNode_t * UtListMain; From 92d4dc7a4d7360e6f7f99940629a325fc7b55b9a Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Fri, 6 Aug 2021 17:15:53 -0400 Subject: [PATCH 4/4] IC:2021-08-03, Bump to v5.1.0-rc1+dev586 --- README.md | 8 ++++++++ src/os/inc/osapi-version.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 04bc286e5..06a364a99 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,14 @@ The autogenerated OSAL user's guide can be viewed at and + + ### Development Build: v5.1.0-rc1+dev578 - Add unit test branch coverage diff --git a/src/os/inc/osapi-version.h b/src/os/inc/osapi-version.h index e37830adb..1cecb3e75 100644 --- a/src/os/inc/osapi-version.h +++ b/src/os/inc/osapi-version.h @@ -36,7 +36,7 @@ /* * Development Build Macro Definitions */ -#define OS_BUILD_NUMBER 578 +#define OS_BUILD_NUMBER 586 #define OS_BUILD_BASELINE "v5.1.0-rc1" /*