@@ -352,6 +352,15 @@ UNITY_DISPLAY_STYLE_UINT = sizeof(unsigned) + UNITY_DISPLAY_RANGE_UINT,
352352 UNITY_DISPLAY_STYLE_UNKNOWN
353353} UNITY_DISPLAY_STYLE_T ;
354354
355+ typedef enum
356+ {
357+ UNITY_EQUAL_TO = 1 ,
358+ UNITY_GREATER_THAN = 2 ,
359+ UNITY_GREATER_OR_EQUAL = 2 + UNITY_EQUAL_TO ,
360+ UNITY_SMALLER_THAN = 4 ,
361+ UNITY_SMALLER_OR_EQUAL = 4 + UNITY_EQUAL_TO
362+ } UNITY_COMPARISON_T ;
363+
355364#ifndef UNITY_EXCLUDE_FLOAT
356365typedef enum UNITY_FLOAT_TRAIT
357366{
@@ -455,17 +464,12 @@ void UnityAssertEqualNumber(const UNITY_INT expected,
455464 const UNITY_LINE_TYPE lineNumber ,
456465 const UNITY_DISPLAY_STYLE_T style );
457466
458- void UnityAssertGreaterNumber (const UNITY_INT threshold ,
459- const UNITY_INT actual ,
460- const char * msg ,
461- const UNITY_LINE_TYPE lineNumber ,
462- const UNITY_DISPLAY_STYLE_T style );
463-
464- void UnityAssertSmallerNumber (const UNITY_INT threshold ,
465- const UNITY_INT actual ,
466- const char * msg ,
467- const UNITY_LINE_TYPE lineNumber ,
468- const UNITY_DISPLAY_STYLE_T style );
467+ void UnityAssertGreaterOrLessOrEqualNumber (const UNITY_INT threshold ,
468+ const UNITY_INT actual ,
469+ const UNITY_COMPARISON_T compare ,
470+ const char * msg ,
471+ const UNITY_LINE_TYPE lineNumber ,
472+ const UNITY_DISPLAY_STYLE_T style );
469473
470474void UnityAssertEqualIntArray (UNITY_INTERNAL_PTR expected ,
471475 UNITY_INTERNAL_PTR actual ,
@@ -664,33 +668,29 @@ int UnityTestMatches(void);
664668#define UNITY_TEST_ASSERT_EQUAL_HEX32 (expected , actual , line , message ) UnityAssertEqualNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
665669#define UNITY_TEST_ASSERT_BITS (mask , expected , actual , line , message ) UnityAssertBits((UNITY_INT)(mask), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line))
666670
667-
668- #define UNITY_TEST_ASSERT_GREATER_THAN_INT (threshold , actual , line , message ) UnityAssertGreaterNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
669- #define UNITY_TEST_ASSERT_GREATER_THAN_INT8 (threshold , actual , line , message ) UnityAssertGreaterNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
670- #define UNITY_TEST_ASSERT_GREATER_THAN_INT16 (threshold , actual , line , message ) UnityAssertGreaterNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
671- #define UNITY_TEST_ASSERT_GREATER_THAN_INT32 (threshold , actual , line , message ) UnityAssertGreaterNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
672- #define UNITY_TEST_ASSERT_GREATER_THAN_UINT (threshold , actual , line , message ) UnityAssertGreaterNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
673- #define UNITY_TEST_ASSERT_GREATER_THAN_UINT8 (threshold , actual , line , message ) UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
674- #define UNITY_TEST_ASSERT_GREATER_THAN_UINT16 (threshold , actual , line , message ) UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
675- #define UNITY_TEST_ASSERT_GREATER_THAN_UINT32 (threshold , actual , line , message ) UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
676- #define UNITY_TEST_ASSERT_GREATER_THAN_HEX8 (threshold , actual , line , message ) UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
677- #define UNITY_TEST_ASSERT_GREATER_THAN_HEX16 (threshold , actual , line , message ) UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
678- #define UNITY_TEST_ASSERT_GREATER_THAN_HEX32 (threshold , actual , line , message ) UnityAssertGreaterNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
679-
680-
681- #define UNITY_TEST_ASSERT_SMALLER_THAN_INT (threshold , actual , line , message ) UnityAssertSmallerNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
682- #define UNITY_TEST_ASSERT_SMALLER_THAN_INT8 (threshold , actual , line , message ) UnityAssertSmallerNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
683- #define UNITY_TEST_ASSERT_SMALLER_THAN_INT16 (threshold , actual , line , message ) UnityAssertSmallerNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
684- #define UNITY_TEST_ASSERT_SMALLER_THAN_INT32 (threshold , actual , line , message ) UnityAssertSmallerNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
685- #define UNITY_TEST_ASSERT_SMALLER_THAN_UINT (threshold , actual , line , message ) UnityAssertSmallerNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
686- #define UNITY_TEST_ASSERT_SMALLER_THAN_UINT8 (threshold , actual , line , message ) UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
687- #define UNITY_TEST_ASSERT_SMALLER_THAN_UINT16 (threshold , actual , line , message ) UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
688- #define UNITY_TEST_ASSERT_SMALLER_THAN_UINT32 (threshold , actual , line , message ) UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
689- #define UNITY_TEST_ASSERT_SMALLER_THAN_HEX8 (threshold , actual , line , message ) UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
690- #define UNITY_TEST_ASSERT_SMALLER_THAN_HEX16 (threshold , actual , line , message ) UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
691- #define UNITY_TEST_ASSERT_SMALLER_THAN_HEX32 (threshold , actual , line , message ) UnityAssertSmallerNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
692-
693-
671+ #define UNITY_TEST_ASSERT_GREATER_THAN_INT (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
672+ #define UNITY_TEST_ASSERT_GREATER_THAN_INT8 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
673+ #define UNITY_TEST_ASSERT_GREATER_THAN_INT16 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
674+ #define UNITY_TEST_ASSERT_GREATER_THAN_INT32 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
675+ #define UNITY_TEST_ASSERT_GREATER_THAN_UINT (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
676+ #define UNITY_TEST_ASSERT_GREATER_THAN_UINT8 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
677+ #define UNITY_TEST_ASSERT_GREATER_THAN_UINT16 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
678+ #define UNITY_TEST_ASSERT_GREATER_THAN_UINT32 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
679+ #define UNITY_TEST_ASSERT_GREATER_THAN_HEX8 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
680+ #define UNITY_TEST_ASSERT_GREATER_THAN_HEX16 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
681+ #define UNITY_TEST_ASSERT_GREATER_THAN_HEX32 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
682+
683+ #define UNITY_TEST_ASSERT_SMALLER_THAN_INT (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
684+ #define UNITY_TEST_ASSERT_SMALLER_THAN_INT8 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
685+ #define UNITY_TEST_ASSERT_SMALLER_THAN_INT16 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16)
686+ #define UNITY_TEST_ASSERT_SMALLER_THAN_INT32 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32)
687+ #define UNITY_TEST_ASSERT_SMALLER_THAN_UINT (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT)
688+ #define UNITY_TEST_ASSERT_SMALLER_THAN_UINT8 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8)
689+ #define UNITY_TEST_ASSERT_SMALLER_THAN_UINT16 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16)
690+ #define UNITY_TEST_ASSERT_SMALLER_THAN_UINT32 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32)
691+ #define UNITY_TEST_ASSERT_SMALLER_THAN_HEX8 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8)
692+ #define UNITY_TEST_ASSERT_SMALLER_THAN_HEX16 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16)
693+ #define UNITY_TEST_ASSERT_SMALLER_THAN_HEX32 (threshold , actual , line , message ) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32)
694694
695695#define UNITY_TEST_ASSERT_INT_WITHIN (delta , expected , actual , line , message ) UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT)
696696#define UNITY_TEST_ASSERT_INT8_WITHIN (delta , expected , actual , line , message ) UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8)
0 commit comments