From c54145145f3ec78931d91b4a28643c5ac3762ed0 Mon Sep 17 00:00:00 2001 From: "U-AM\\505903" <505903@SHK-U505903L001.AM.ad.seagate.com> Date: Fri, 12 Apr 2013 13:18:32 -0500 Subject: [PATCH 1/8] A small change to the makefile so that it builds in a cygwin environment --- makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/makefile b/makefile index 9a0443c..c1bbf72 100644 --- a/makefile +++ b/makefile @@ -17,7 +17,9 @@ SRC_FILES=src/unity.c test/testunity.c build/testunity_Runner.c INC_DIRS=-Isrc SYMBOLS=-DTEST -DUNITY_SUPPORT_64 -ifeq ($(OS),Windows_NT) +ifeq ($(OSTYPE),cygwin) + CLEANUP = rm -f build/*.o ; rm -f $(TARGET) ; mkdir -p build +else ifeq ($(OS),Windows_NT) CLEANUP = del /F /Q build\* && del /F /Q $(TARGET) else CLEANUP = rm -f build/*.o ; rm -f $(TARGET) ; mkdir -p build From 19c405ff959684e6962a63e8899e52302defa3f4 Mon Sep 17 00:00:00 2001 From: Stephen Hawley Date: Fri, 12 Apr 2013 15:01:13 -0500 Subject: [PATCH 2/8] One more edit to build under cygwin --- examples/makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/makefile b/examples/makefile index 98258e4..11d754d 100644 --- a/examples/makefile +++ b/examples/makefile @@ -19,7 +19,9 @@ SRC_FILES2=../src/unity.c src/ProductionCode2.c test/TestProductionCode2.c test/ INC_DIRS=-Isrc -I../src SYMBOLS=-DTEST -ifeq ($(OS),Windows_NT) +ifeq ($(OSTYPE),cygwin) + CLEANUP = rm -f build/*.o ; rm -f $(TARGET) ; mkdir -p build +else ifeq ($(OS),Windows_NT) CLEANUP = del /F /Q build\* && del /F /Q $(TARGET1) && del /F /Q $(TARGET2) else CLEANUP = rm -f build/*.o ; rm -f $(TARGET1) ; rm -f $(TARGET2) From 4460fc50f110014a6d0e884e301ac05bb797d018 Mon Sep 17 00:00:00 2001 From: shellyniz Date: Fri, 21 Jun 2013 20:23:24 +0300 Subject: [PATCH 3/8] Update generate_test_runner.rb Bug - compilation error when using parametrized tests with user defined types. When using TEST_CASE and parametrised test and passing parameters which are of user defined types, the test_runner does not compile because it does not recognize the user defined types. Test runner should copy the include statements from the test file --- auto/generate_test_runner.rb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index b7d37ac..6a612eb 100644 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -45,7 +45,7 @@ class UnityTestRunnerGenerator end #build runner file - generate(input_file, output_file, tests, used_mocks) + generate(input_file, output_file, tests, used_mocks, testfile_includes) #determine which files were used to return them all_files_used = [input_file, output_file] @@ -54,9 +54,9 @@ class UnityTestRunnerGenerator return all_files_used.uniq end - def generate(input_file, output_file, tests, used_mocks) + def generate(input_file, output_file, tests, used_mocks, testfile_includes) File.open(output_file, 'w') do |output| - create_header(output, used_mocks) + create_header(output, used_mocks, testfile_includes) create_externs(output, tests, used_mocks) create_mock_management(output, used_mocks) create_suite_setup_and_teardown(output) @@ -121,7 +121,10 @@ class UnityTestRunnerGenerator source.gsub!(/\/\/.*$/, '') # remove line comments (all that remain) #parse out includes - return source.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/).flatten + includes = source.scan(/^\s*#include\s+\"\s*(.+)\.[hH]\s*\"/).flatten + brackets_includes = source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten + brackets_includes.each { |inc| includes << '<' + inc +'>' } + return includes end def find_mocks(includes) @@ -132,7 +135,7 @@ class UnityTestRunnerGenerator return mock_headers end - def create_header(output, mocks) + def create_header(output, mocks, testfile_includes) output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */') create_runtest(output, mocks) output.puts("\n//=======Automagically Detected Files To Include=====") @@ -144,6 +147,11 @@ class UnityTestRunnerGenerator output.puts('#include ') output.puts('#include ') output.puts('#include "CException.h"') if @options[:plugins].include?(:cexception) + testfile_includes.delete("unity").delete("cmock") + testrunner_includes = testfile_includes - mocks + testrunner_includes.each do |inc| + output.puts("#include #{inc.include?('<') ? inc : "\"#{inc.gsub('.h','')}.h\""}") + end mocks.each do |mock| output.puts("#include \"#{mock.gsub('.h','')}.h\"") end From 318dc8f35a7eab101bf16d499410acc80aac8c95 Mon Sep 17 00:00:00 2001 From: Antony Male Date: Fri, 28 Jun 2013 10:56:23 +0100 Subject: [PATCH 4/8] Fix unit tests for TEST_ASSERT_EQUAL_HEX_ARRAY on 16-bit architectures Previously, TEST_ASSERT_EQUAL_HEX_ARRAY was being called, and passed arrays of type 'unsigned int'. TEST_ASSERT_EQUAL_HEX_ARRAY is an alias for TEST_ASSERT_EQUAL_HEX32_ARRAY in *all* cases (and is documented as such), while 'unsigned int' is 16 bits on some platforms. Unsurprisingly this caused some tests to fail. Fix by replacing the 'unsigned int' declarations with '_UU32'. --- test/testunity.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/testunity.c b/test/testunity.c index 2a10894..b4c50ad 100755 --- a/test/testunity.c +++ b/test/testunity.c @@ -1622,10 +1622,10 @@ void testNotEqualUINT32Arrays3(void) void testEqualHEXArrays(void) { - unsigned int p0[] = {1, 8, 987, 65132u}; - unsigned int p1[] = {1, 8, 987, 65132u}; - unsigned int p2[] = {1, 8, 987, 2}; - unsigned int p3[] = {1, 500, 600, 700}; + _UU32 p0[] = {1, 8, 987, 65132u}; + _UU32 p1[] = {1, 8, 987, 65132u}; + _UU32 p2[] = {1, 8, 987, 2}; + _UU32 p3[] = {1, 500, 600, 700}; TEST_ASSERT_EQUAL_HEX_ARRAY(p0, p0, 1); TEST_ASSERT_EQUAL_HEX_ARRAY(p0, p0, 4); @@ -1636,8 +1636,8 @@ void testEqualHEXArrays(void) void testNotEqualHEXArrays1(void) { - unsigned int p0[] = {1, 8, 987, 65132u}; - unsigned int p1[] = {1, 8, 987, 65131u}; + _UU32 p0[] = {1, 8, 987, 65132u}; + _UU32 p1[] = {1, 8, 987, 65131u}; EXPECT_ABORT_BEGIN TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p1, 4); @@ -1646,8 +1646,8 @@ void testNotEqualHEXArrays1(void) void testNotEqualHEXArrays2(void) { - unsigned int p0[] = {1, 8, 987, 65132u}; - unsigned int p1[] = {2, 8, 987, 65132u}; + _UU32 p0[] = {1, 8, 987, 65132u}; + _UU32 p1[] = {2, 8, 987, 65132u}; EXPECT_ABORT_BEGIN TEST_ASSERT_EQUAL_HEX32_ARRAY(p0, p1, 4); @@ -1656,8 +1656,8 @@ void testNotEqualHEXArrays2(void) void testNotEqualHEXArrays3(void) { - unsigned int p0[] = {1, 8, 987, 65132u}; - unsigned int p1[] = {1, 8, 986, 65132u}; + _UU32 p0[] = {1, 8, 987, 65132u}; + _UU32 p1[] = {1, 8, 986, 65132u}; EXPECT_ABORT_BEGIN TEST_ASSERT_EQUAL_HEX_ARRAY(p0, p1, 4); @@ -2964,4 +2964,4 @@ void testNotEqualDoubleArraysInf(void) TEST_ASSERT_EQUAL_DOUBLE_ARRAY(p0, p1, 4); VERIFY_FAILS_END #endif -} \ No newline at end of file +} From 6dd44f23c9e1c45b16461db336b2e2c491b3a5e3 Mon Sep 17 00:00:00 2001 From: Antony Male Date: Wed, 17 Jul 2013 14:49:34 +0100 Subject: [PATCH 5/8] Allow pointer types to have an attribute Microchip's XC16 and friends, when used with dsPICs, require that all pointers to memory which could possibly be in EDS space by adorned with __eds__, e.g. __eds__ int* p_int Adding the macro UNITY_PTR_ATTRIBUTE allows Unity's pointers to be decorated with whatever ridiculous attributes the compiler requires. --- src/unity.c | 62 +++++++++++++++++++++---------------------- src/unity_internals.h | 54 ++++++++++++++++++++----------------- 2 files changed, 60 insertions(+), 56 deletions(-) diff --git a/src/unity.c b/src/unity.c index 9865afe..ad71046 100644 --- a/src/unity.c +++ b/src/unity.c @@ -327,7 +327,7 @@ void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual // Assertion & Control Helpers //----------------------------------------------- -int UnityCheckArraysForNull(const void* expected, const void* actual, const UNITY_LINE_TYPE lineNumber, const char* msg) +int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_ATTRIBUTE const void* actual, const UNITY_LINE_TYPE lineNumber, const char* msg) { //return true if they are both NULL if ((expected == NULL) && (actual == NULL)) @@ -401,16 +401,16 @@ void UnityAssertEqualNumber(const _U_SINT expected, } //----------------------------------------------- -void UnityAssertEqualIntArray(const _U_SINT* expected, - const _U_SINT* actual, +void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const _U_SINT* expected, + UNITY_PTR_ATTRIBUTE const _U_SINT* actual, const _UU32 num_elements, const char* msg, const UNITY_LINE_TYPE lineNumber, const UNITY_DISPLAY_STYLE_T style) { _UU32 elements = num_elements; - const _US8* ptr_exp = (_US8*)expected; - const _US8* ptr_act = (_US8*)actual; + UNITY_PTR_ATTRIBUTE const _US8* ptr_exp = (UNITY_PTR_ATTRIBUTE _US8*)expected; + UNITY_PTR_ATTRIBUTE const _US8* ptr_act = (UNITY_PTR_ATTRIBUTE _US8*)actual; UNITY_SKIP_EXECUTION; @@ -422,7 +422,7 @@ void UnityAssertEqualIntArray(const _U_SINT* expected, UNITY_FAIL_AND_BAIL; } - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) + if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) return; // If style is UNITY_DISPLAY_STYLE_INT, we'll fall into the default case rather than the INT16 or INT32 (etc) case @@ -456,15 +456,15 @@ void UnityAssertEqualIntArray(const _U_SINT* expected, case UNITY_DISPLAY_STYLE_UINT16: while (elements--) { - if (*(_US16*)ptr_exp != *(_US16*)ptr_act) + if (*(UNITY_PTR_ATTRIBUTE _US16*)ptr_exp != *(UNITY_PTR_ATTRIBUTE _US16*)ptr_act) { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrElement); UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(_US16*)ptr_exp, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US16*)ptr_exp, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(_US16*)ptr_act, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US16*)ptr_act, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -478,15 +478,15 @@ void UnityAssertEqualIntArray(const _U_SINT* expected, case UNITY_DISPLAY_STYLE_UINT64: while (elements--) { - if (*(_US64*)ptr_exp != *(_US64*)ptr_act) + if (*(UNITY_PTR_ATTRIBUTE _US64*)ptr_exp != *(UNITY_PTR_ATTRIBUTE _US64*)ptr_act) { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrElement); UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(_US64*)ptr_exp, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US64*)ptr_exp, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(_US64*)ptr_act, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US64*)ptr_act, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -498,15 +498,15 @@ void UnityAssertEqualIntArray(const _U_SINT* expected, default: while (elements--) { - if (*(_US32*)ptr_exp != *(_US32*)ptr_act) + if (*(UNITY_PTR_ATTRIBUTE _US32*)ptr_exp != *(UNITY_PTR_ATTRIBUTE _US32*)ptr_act) { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrElement); UnityPrintNumberByStyle((num_elements - elements - 1), UNITY_DISPLAY_STYLE_UINT); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*(_US32*)ptr_exp, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US32*)ptr_exp, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*(_US32*)ptr_act, style); + UnityPrintNumberByStyle(*(UNITY_PTR_ATTRIBUTE _US32*)ptr_act, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -519,15 +519,15 @@ void UnityAssertEqualIntArray(const _U_SINT* expected, //----------------------------------------------- #ifndef UNITY_EXCLUDE_FLOAT -void UnityAssertEqualFloatArray(const _UF* expected, - const _UF* actual, +void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected, + UNITY_PTR_ATTRIBUTE const _UF* actual, const _UU32 num_elements, const char* msg, const UNITY_LINE_TYPE lineNumber) { _UU32 elements = num_elements; - const _UF* ptr_expected = expected; - const _UF* ptr_actual = actual; + UNITY_PTR_ATTRIBUTE const _UF* ptr_expected = expected; + UNITY_PTR_ATTRIBUTE const _UF* ptr_actual = actual; _UF diff, tol; UNITY_SKIP_EXECUTION; @@ -540,7 +540,7 @@ void UnityAssertEqualFloatArray(const _UF* expected, UNITY_FAIL_AND_BAIL; } - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) + if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) return; while (elements--) @@ -691,15 +691,15 @@ void UnityAssertFloatIsNaN(const _UF actual, //----------------------------------------------- #ifndef UNITY_EXCLUDE_DOUBLE -void UnityAssertEqualDoubleArray(const _UD* expected, - const _UD* actual, +void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected, + UNITY_PTR_ATTRIBUTE const _UD* actual, const _UU32 num_elements, const char* msg, const UNITY_LINE_TYPE lineNumber) { _UU32 elements = num_elements; - const _UD* ptr_expected = expected; - const _UD* ptr_actual = actual; + UNITY_PTR_ATTRIBUTE const _UD* ptr_expected = expected; + UNITY_PTR_ATTRIBUTE const _UD* ptr_actual = actual; _UD diff, tol; UNITY_SKIP_EXECUTION; @@ -712,7 +712,7 @@ void UnityAssertEqualDoubleArray(const _UD* expected, UNITY_FAIL_AND_BAIL; } - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) + if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) return; while (elements--) @@ -955,7 +955,7 @@ void UnityAssertEqualStringArray( const char** expected, UNITY_FAIL_AND_BAIL; } - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) + if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) return; do @@ -996,15 +996,15 @@ void UnityAssertEqualStringArray( const char** expected, } //----------------------------------------------- -void UnityAssertEqualMemory( const void* expected, - const void* actual, +void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected, + UNITY_PTR_ATTRIBUTE const void* actual, const _UU32 length, const _UU32 num_elements, const char* msg, const UNITY_LINE_TYPE lineNumber) { - unsigned char* ptr_exp = (unsigned char*)expected; - unsigned char* ptr_act = (unsigned char*)actual; + UNITY_PTR_ATTRIBUTE unsigned char* ptr_exp = (UNITY_PTR_ATTRIBUTE unsigned char*)expected; + UNITY_PTR_ATTRIBUTE unsigned char* ptr_act = (UNITY_PTR_ATTRIBUTE unsigned char*)actual; _UU32 elements = num_elements; _UU32 bytes; @@ -1018,7 +1018,7 @@ void UnityAssertEqualMemory( const void* expected, UNITY_FAIL_AND_BAIL; } - if (UnityCheckArraysForNull((void*)expected, (void*)actual, lineNumber, msg) == 1) + if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) return; while (elements--) diff --git a/src/unity_internals.h b/src/unity_internals.h index 7020756..484b383 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -173,6 +173,10 @@ typedef _US64 _U_SINT; #error Invalid UNITY_POINTER_WIDTH specified! (16, 32 or 64 are supported) #endif +#ifndef UNITY_PTR_ATTRIBUTE + #define UNITY_PTR_ATTRIBUTE +#endif + //------------------------------------------------------- // Float Support //------------------------------------------------------- @@ -354,8 +358,8 @@ void UnityAssertEqualNumber(const _U_SINT expected, const UNITY_LINE_TYPE lineNumber, const UNITY_DISPLAY_STYLE_T style); -void UnityAssertEqualIntArray(const _U_SINT* expected, - const _U_SINT* actual, +void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const _U_SINT* expected, + UNITY_PTR_ATTRIBUTE const _U_SINT* actual, const _UU32 num_elements, const char* msg, const UNITY_LINE_TYPE lineNumber, @@ -378,8 +382,8 @@ void UnityAssertEqualStringArray( const char** expected, const char* msg, const UNITY_LINE_TYPE lineNumber); -void UnityAssertEqualMemory( const void* expected, - const void* actual, +void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected, + UNITY_PTR_ATTRIBUTE const void* actual, const _UU32 length, const _UU32 num_elements, const char* msg, @@ -403,8 +407,8 @@ void UnityAssertFloatsWithin(const _UF delta, const char* msg, const UNITY_LINE_TYPE lineNumber); -void UnityAssertEqualFloatArray(const _UF* expected, - const _UF* actual, +void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected, + UNITY_PTR_ATTRIBUTE const _UF* actual, const _UU32 num_elements, const char* msg, const UNITY_LINE_TYPE lineNumber); @@ -429,8 +433,8 @@ void UnityAssertDoublesWithin(const _UD delta, const char* msg, const UNITY_LINE_TYPE lineNumber); -void UnityAssertEqualDoubleArray(const _UD* expected, - const _UD* actual, +void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected, + UNITY_PTR_ATTRIBUTE const _UD* actual, const _UU32 num_elements, const char* msg, const UNITY_LINE_TYPE lineNumber); @@ -484,30 +488,30 @@ void UnityAssertDoubleIsNaN(const _UD actual, #define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(_UP)(expected), (_U_SINT)(_UP)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER) #define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message) UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)line) -#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message) UnityAssertEqualMemory((void*)(expected), (void*)(actual), (_UU32)(len), 1, (message), (UNITY_LINE_TYPE)line) +#define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message) UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE void*)(expected), (UNITY_PTR_ATTRIBUTE void*)(actual), (_UU32)(len), 1, (message), (UNITY_LINE_TYPE)line) -#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT32) -#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT8) -#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT16) -#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(_UP*)(expected), (const _U_SINT*)(_UP*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER) +#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) +#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8) +#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT16) +#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT32) +#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) +#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT8) +#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT16) +#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT32) +#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8) +#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16) +#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32) +#define UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(_UP*)(expected), (const _U_SINT*)(_UP*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER) #define UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualStringArray((const char**)(expected), (const char**)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line) -#define UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, line, message) UnityAssertEqualMemory((void*)(expected), (void*)(actual), (_UU32)(len), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line) +#define UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, line, message) UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE void*)(expected), (UNITY_PTR_ATTRIBUTE void*)(actual), (_UU32)(len), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line) #ifdef UNITY_SUPPORT_64 #define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT64) #define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT64) #define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message) UnityAssertEqualNumber((_U_SINT)(expected), (_U_SINT)(actual), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64) -#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((const _U_SINT*)(expected), (const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64) +#define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT64) +#define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT64) +#define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64) #define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((_U_SINT)(delta), (_U_SINT)(expected), (_U_SINT)(actual), NULL, (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX64) #endif From ff1339ca5ab96512d1c068693b3caab7604eaee4 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sun, 22 Sep 2013 10:58:36 -0400 Subject: [PATCH 6/8] - Fixed a gcc warning when -Wall enabled. (Thanks gjcamann) --- src/unity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unity.c b/src/unity.c index ad71046..6cd77e1 100644 --- a/src/unity.c +++ b/src/unity.c @@ -14,7 +14,7 @@ #define UNITY_SKIP_EXECUTION { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} } #define UNITY_PRINT_EOL { UNITY_OUTPUT_CHAR('\n'); } -struct _Unity Unity = { 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , { 0 } }; +struct _Unity Unity = { 0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 , {{{ 0 }}} }; const char* UnityStrNull = "NULL"; const char* UnityStrSpacer = ". "; From 72c55e0266a9a8350dc588e68036fa95906f5bdf Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sun, 22 Sep 2013 11:53:48 -0400 Subject: [PATCH 7/8] - Fixed script tests to match Shelly's changes --- test/expectdata/testsample_cmd.c | 111 +++++++-------- test/expectdata/testsample_def.c | 103 +++++++------- test/expectdata/testsample_mock_cmd.c | 154 ++++++++++----------- test/expectdata/testsample_mock_def.c | 146 ++++++++++---------- test/expectdata/testsample_mock_new1.c | 172 +++++++++++------------ test/expectdata/testsample_mock_new2.c | 172 +++++++++++------------ test/expectdata/testsample_mock_param.c | 148 ++++++++++---------- test/expectdata/testsample_mock_run1.c | 172 +++++++++++------------ test/expectdata/testsample_mock_run2.c | 172 +++++++++++------------ test/expectdata/testsample_mock_yaml.c | 174 ++++++++++++------------ test/expectdata/testsample_new1.c | 123 +++++++++-------- test/expectdata/testsample_new2.c | 129 +++++++++--------- test/expectdata/testsample_param.c | 105 +++++++------- test/expectdata/testsample_run1.c | 123 +++++++++-------- test/expectdata/testsample_run2.c | 129 +++++++++--------- test/expectdata/testsample_yaml.c | 131 +++++++++--------- 16 files changed, 1152 insertions(+), 1112 deletions(-) diff --git a/test/expectdata/testsample_cmd.c b/test/expectdata/testsample_cmd.c index a014d9e..d426dde 100644 --- a/test/expectdata/testsample_cmd.c +++ b/test/expectdata/testsample_cmd.c @@ -1,54 +1,57 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CEXCEPTION_T e; \ - Try { \ - setUp(); \ - TestFunc(); \ - } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ - } \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include -#include -#include "CException.h" - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Test Reset Option===== -void resetTest() -{ - tearDown(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - Unity.TestFile = "test/testdata/testsample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CEXCEPTION_T e; \ + Try { \ + setUp(); \ + TestFunc(); \ + } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ + } \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include +#include +#include "CException.h" +#include "funky.h" +#include "stanky.h" +#include + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Test Reset Option===== +void resetTest() +{ + tearDown(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return (UnityEnd()); +} diff --git a/test/expectdata/testsample_def.c b/test/expectdata/testsample_def.c index 5c0bd3b..8cdedde 100644 --- a/test/expectdata/testsample_def.c +++ b/test/expectdata/testsample_def.c @@ -1,50 +1,53 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - setUp(); \ - TestFunc(); \ - } \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include -#include - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Test Reset Option===== -void resetTest() -{ - tearDown(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - Unity.TestFile = "test/testdata/testsample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + setUp(); \ + TestFunc(); \ + } \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include +#include +#include "funky.h" +#include "stanky.h" +#include + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Test Reset Option===== +void resetTest() +{ + tearDown(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return (UnityEnd()); +} diff --git a/test/expectdata/testsample_mock_cmd.c b/test/expectdata/testsample_mock_cmd.c index b571d73..c62c3b5 100644 --- a/test/expectdata/testsample_mock_cmd.c +++ b/test/expectdata/testsample_mock_cmd.c @@ -1,76 +1,78 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CEXCEPTION_T e; \ - Try { \ - CMock_Init(); \ - setUp(); \ - TestFunc(); \ - CMock_Verify(); \ - } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ - } \ - CMock_Destroy(); \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include "cmock.h" -#include -#include -#include "CException.h" -#include "Mockstanky.h" - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Mock Management===== -static void CMock_Init(void) -{ - Mockstanky_Init(); -} -static void CMock_Verify(void) -{ - Mockstanky_Verify(); -} -static void CMock_Destroy(void) -{ - Mockstanky_Destroy(); -} - -//=======Test Reset Option===== -void resetTest() -{ - CMock_Verify(); - CMock_Destroy(); - tearDown(); - CMock_Init(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - Unity.TestFile = "test/testdata/mocksample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CEXCEPTION_T e; \ + Try { \ + CMock_Init(); \ + setUp(); \ + TestFunc(); \ + CMock_Verify(); \ + } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ + } \ + CMock_Destroy(); \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include "cmock.h" +#include +#include +#include "CException.h" +#include "funky.h" +#include +#include "Mockstanky.h" + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Mock Management===== +static void CMock_Init(void) +{ + Mockstanky_Init(); +} +static void CMock_Verify(void) +{ + Mockstanky_Verify(); +} +static void CMock_Destroy(void) +{ + Mockstanky_Destroy(); +} + +//=======Test Reset Option===== +void resetTest() +{ + CMock_Verify(); + CMock_Destroy(); + tearDown(); + CMock_Init(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return (UnityEnd()); +} diff --git a/test/expectdata/testsample_mock_def.c b/test/expectdata/testsample_mock_def.c index 54060ce..e971179 100644 --- a/test/expectdata/testsample_mock_def.c +++ b/test/expectdata/testsample_mock_def.c @@ -1,72 +1,74 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CMock_Init(); \ - setUp(); \ - TestFunc(); \ - CMock_Verify(); \ - } \ - CMock_Destroy(); \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include "cmock.h" -#include -#include -#include "Mockstanky.h" - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Mock Management===== -static void CMock_Init(void) -{ - Mockstanky_Init(); -} -static void CMock_Verify(void) -{ - Mockstanky_Verify(); -} -static void CMock_Destroy(void) -{ - Mockstanky_Destroy(); -} - -//=======Test Reset Option===== -void resetTest() -{ - CMock_Verify(); - CMock_Destroy(); - tearDown(); - CMock_Init(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - Unity.TestFile = "test/testdata/mocksample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CMock_Init(); \ + setUp(); \ + TestFunc(); \ + CMock_Verify(); \ + } \ + CMock_Destroy(); \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include "cmock.h" +#include +#include +#include "funky.h" +#include +#include "Mockstanky.h" + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Mock Management===== +static void CMock_Init(void) +{ + Mockstanky_Init(); +} +static void CMock_Verify(void) +{ + Mockstanky_Verify(); +} +static void CMock_Destroy(void) +{ + Mockstanky_Destroy(); +} + +//=======Test Reset Option===== +void resetTest() +{ + CMock_Verify(); + CMock_Destroy(); + tearDown(); + CMock_Init(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return (UnityEnd()); +} diff --git a/test/expectdata/testsample_mock_new1.c b/test/expectdata/testsample_mock_new1.c index 161e6f7..070927a 100644 --- a/test/expectdata/testsample_mock_new1.c +++ b/test/expectdata/testsample_mock_new1.c @@ -1,85 +1,87 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CEXCEPTION_T e; \ - Try { \ - CMock_Init(); \ - setUp(); \ - TestFunc(); \ - CMock_Verify(); \ - } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ - } \ - CMock_Destroy(); \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include "cmock.h" -#include "one.h" -#include "two.h" -#include -#include -#include "CException.h" -#include "Mockstanky.h" - -int GlobalExpectCount; -int GlobalVerifyOrder; -char* GlobalOrderError; - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Mock Management===== -static void CMock_Init(void) -{ - GlobalExpectCount = 0; - GlobalVerifyOrder = 0; - GlobalOrderError = NULL; - Mockstanky_Init(); -} -static void CMock_Verify(void) -{ - Mockstanky_Verify(); -} -static void CMock_Destroy(void) -{ - Mockstanky_Destroy(); -} - -//=======Test Reset Option===== -void resetTest() -{ - CMock_Verify(); - CMock_Destroy(); - tearDown(); - CMock_Init(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - Unity.TestFile = "test/testdata/mocksample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CEXCEPTION_T e; \ + Try { \ + CMock_Init(); \ + setUp(); \ + TestFunc(); \ + CMock_Verify(); \ + } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ + } \ + CMock_Destroy(); \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include "cmock.h" +#include "one.h" +#include "two.h" +#include +#include +#include "CException.h" +#include "funky.h" +#include +#include "Mockstanky.h" + +int GlobalExpectCount; +int GlobalVerifyOrder; +char* GlobalOrderError; + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Mock Management===== +static void CMock_Init(void) +{ + GlobalExpectCount = 0; + GlobalVerifyOrder = 0; + GlobalOrderError = NULL; + Mockstanky_Init(); +} +static void CMock_Verify(void) +{ + Mockstanky_Verify(); +} +static void CMock_Destroy(void) +{ + Mockstanky_Destroy(); +} + +//=======Test Reset Option===== +void resetTest() +{ + CMock_Verify(); + CMock_Destroy(); + tearDown(); + CMock_Init(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return (UnityEnd()); +} diff --git a/test/expectdata/testsample_mock_new2.c b/test/expectdata/testsample_mock_new2.c index dc44775..6d786ba 100644 --- a/test/expectdata/testsample_mock_new2.c +++ b/test/expectdata/testsample_mock_new2.c @@ -1,85 +1,87 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CMock_Init(); \ - setUp(); \ - TestFunc(); \ - CMock_Verify(); \ - } \ - CMock_Destroy(); \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include "cmock.h" -#include -#include -#include "Mockstanky.h" - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Mock Management===== -static void CMock_Init(void) -{ - Mockstanky_Init(); -} -static void CMock_Verify(void) -{ - Mockstanky_Verify(); -} -static void CMock_Destroy(void) -{ - Mockstanky_Destroy(); -} - -//=======Suite Setup===== -static int suite_setup(void) -{ -a_custom_setup(); -} - -//=======Suite Teardown===== -static int suite_teardown(int num_failures) -{ -a_custom_teardown(); -} - -//=======Test Reset Option===== -void resetTest() -{ - CMock_Verify(); - CMock_Destroy(); - tearDown(); - CMock_Init(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - suite_setup(); - Unity.TestFile = "test/testdata/mocksample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return suite_teardown(UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CMock_Init(); \ + setUp(); \ + TestFunc(); \ + CMock_Verify(); \ + } \ + CMock_Destroy(); \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include "cmock.h" +#include +#include +#include "funky.h" +#include +#include "Mockstanky.h" + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Mock Management===== +static void CMock_Init(void) +{ + Mockstanky_Init(); +} +static void CMock_Verify(void) +{ + Mockstanky_Verify(); +} +static void CMock_Destroy(void) +{ + Mockstanky_Destroy(); +} + +//=======Suite Setup===== +static int suite_setup(void) +{ +a_custom_setup(); +} + +//=======Suite Teardown===== +static int suite_teardown(int num_failures) +{ +a_custom_teardown(); +} + +//=======Test Reset Option===== +void resetTest() +{ + CMock_Verify(); + CMock_Destroy(); + tearDown(); + CMock_Init(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + suite_setup(); + Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return suite_teardown(UnityEnd()); +} diff --git a/test/expectdata/testsample_mock_param.c b/test/expectdata/testsample_mock_param.c index 2f06037..39f6c91 100644 --- a/test/expectdata/testsample_mock_param.c +++ b/test/expectdata/testsample_mock_param.c @@ -1,73 +1,75 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST_NO_ARGS -#define RUN_TEST(TestFunc, TestLineNum, ...) \ -{ \ - Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CMock_Init(); \ - setUp(); \ - TestFunc(__VA_ARGS__); \ - CMock_Verify(); \ - } \ - CMock_Destroy(); \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include "cmock.h" -#include -#include -#include "Mockstanky.h" - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Mock Management===== -static void CMock_Init(void) -{ - Mockstanky_Init(); -} -static void CMock_Verify(void) -{ - Mockstanky_Verify(); -} -static void CMock_Destroy(void) -{ - Mockstanky_Destroy(); -} - -//=======Test Reset Option===== -void resetTest() -{ - CMock_Verify(); - CMock_Destroy(); - tearDown(); - CMock_Init(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - Unity.TestFile = "test/testdata/mocksample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS); - RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST_NO_ARGS +#define RUN_TEST(TestFunc, TestLineNum, ...) \ +{ \ + Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CMock_Init(); \ + setUp(); \ + TestFunc(__VA_ARGS__); \ + CMock_Verify(); \ + } \ + CMock_Destroy(); \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include "cmock.h" +#include +#include +#include "funky.h" +#include +#include "Mockstanky.h" + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Mock Management===== +static void CMock_Init(void) +{ + Mockstanky_Init(); +} +static void CMock_Verify(void) +{ + Mockstanky_Verify(); +} +static void CMock_Destroy(void) +{ + Mockstanky_Destroy(); +} + +//=======Test Reset Option===== +void resetTest() +{ + CMock_Verify(); + CMock_Destroy(); + tearDown(); + CMock_Init(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS); + RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS); + + return (UnityEnd()); +} diff --git a/test/expectdata/testsample_mock_run1.c b/test/expectdata/testsample_mock_run1.c index 161e6f7..070927a 100644 --- a/test/expectdata/testsample_mock_run1.c +++ b/test/expectdata/testsample_mock_run1.c @@ -1,85 +1,87 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CEXCEPTION_T e; \ - Try { \ - CMock_Init(); \ - setUp(); \ - TestFunc(); \ - CMock_Verify(); \ - } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ - } \ - CMock_Destroy(); \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include "cmock.h" -#include "one.h" -#include "two.h" -#include -#include -#include "CException.h" -#include "Mockstanky.h" - -int GlobalExpectCount; -int GlobalVerifyOrder; -char* GlobalOrderError; - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Mock Management===== -static void CMock_Init(void) -{ - GlobalExpectCount = 0; - GlobalVerifyOrder = 0; - GlobalOrderError = NULL; - Mockstanky_Init(); -} -static void CMock_Verify(void) -{ - Mockstanky_Verify(); -} -static void CMock_Destroy(void) -{ - Mockstanky_Destroy(); -} - -//=======Test Reset Option===== -void resetTest() -{ - CMock_Verify(); - CMock_Destroy(); - tearDown(); - CMock_Init(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - Unity.TestFile = "test/testdata/mocksample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CEXCEPTION_T e; \ + Try { \ + CMock_Init(); \ + setUp(); \ + TestFunc(); \ + CMock_Verify(); \ + } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ + } \ + CMock_Destroy(); \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include "cmock.h" +#include "one.h" +#include "two.h" +#include +#include +#include "CException.h" +#include "funky.h" +#include +#include "Mockstanky.h" + +int GlobalExpectCount; +int GlobalVerifyOrder; +char* GlobalOrderError; + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Mock Management===== +static void CMock_Init(void) +{ + GlobalExpectCount = 0; + GlobalVerifyOrder = 0; + GlobalOrderError = NULL; + Mockstanky_Init(); +} +static void CMock_Verify(void) +{ + Mockstanky_Verify(); +} +static void CMock_Destroy(void) +{ + Mockstanky_Destroy(); +} + +//=======Test Reset Option===== +void resetTest() +{ + CMock_Verify(); + CMock_Destroy(); + tearDown(); + CMock_Init(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return (UnityEnd()); +} diff --git a/test/expectdata/testsample_mock_run2.c b/test/expectdata/testsample_mock_run2.c index dc44775..6d786ba 100644 --- a/test/expectdata/testsample_mock_run2.c +++ b/test/expectdata/testsample_mock_run2.c @@ -1,85 +1,87 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CMock_Init(); \ - setUp(); \ - TestFunc(); \ - CMock_Verify(); \ - } \ - CMock_Destroy(); \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include "cmock.h" -#include -#include -#include "Mockstanky.h" - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Mock Management===== -static void CMock_Init(void) -{ - Mockstanky_Init(); -} -static void CMock_Verify(void) -{ - Mockstanky_Verify(); -} -static void CMock_Destroy(void) -{ - Mockstanky_Destroy(); -} - -//=======Suite Setup===== -static int suite_setup(void) -{ -a_custom_setup(); -} - -//=======Suite Teardown===== -static int suite_teardown(int num_failures) -{ -a_custom_teardown(); -} - -//=======Test Reset Option===== -void resetTest() -{ - CMock_Verify(); - CMock_Destroy(); - tearDown(); - CMock_Init(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - suite_setup(); - Unity.TestFile = "test/testdata/mocksample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return suite_teardown(UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CMock_Init(); \ + setUp(); \ + TestFunc(); \ + CMock_Verify(); \ + } \ + CMock_Destroy(); \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include "cmock.h" +#include +#include +#include "funky.h" +#include +#include "Mockstanky.h" + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Mock Management===== +static void CMock_Init(void) +{ + Mockstanky_Init(); +} +static void CMock_Verify(void) +{ + Mockstanky_Verify(); +} +static void CMock_Destroy(void) +{ + Mockstanky_Destroy(); +} + +//=======Suite Setup===== +static int suite_setup(void) +{ +a_custom_setup(); +} + +//=======Suite Teardown===== +static int suite_teardown(int num_failures) +{ +a_custom_teardown(); +} + +//=======Test Reset Option===== +void resetTest() +{ + CMock_Verify(); + CMock_Destroy(); + tearDown(); + CMock_Init(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + suite_setup(); + Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return suite_teardown(UnityEnd()); +} diff --git a/test/expectdata/testsample_mock_yaml.c b/test/expectdata/testsample_mock_yaml.c index 00c846c..cf680fd 100644 --- a/test/expectdata/testsample_mock_yaml.c +++ b/test/expectdata/testsample_mock_yaml.c @@ -1,86 +1,88 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CEXCEPTION_T e; \ - Try { \ - CMock_Init(); \ - setUp(); \ - TestFunc(); \ - CMock_Verify(); \ - } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ - } \ - CMock_Destroy(); \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include "cmock.h" -#include "two.h" -#include "three.h" -#include -#include -#include -#include "CException.h" -#include "Mockstanky.h" - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Mock Management===== -static void CMock_Init(void) -{ - Mockstanky_Init(); -} -static void CMock_Verify(void) -{ - Mockstanky_Verify(); -} -static void CMock_Destroy(void) -{ - Mockstanky_Destroy(); -} - -//=======Suite Setup===== -static int suite_setup(void) -{ -a_yaml_setup(); -} - -//=======Test Reset Option===== -void resetTest() -{ - CMock_Verify(); - CMock_Destroy(); - tearDown(); - CMock_Init(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - suite_setup(); - Unity.TestFile = "test/testdata/mocksample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CEXCEPTION_T e; \ + Try { \ + CMock_Init(); \ + setUp(); \ + TestFunc(); \ + CMock_Verify(); \ + } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ + } \ + CMock_Destroy(); \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include "cmock.h" +#include "two.h" +#include "three.h" +#include +#include +#include +#include "CException.h" +#include "funky.h" +#include +#include "Mockstanky.h" + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Mock Management===== +static void CMock_Init(void) +{ + Mockstanky_Init(); +} +static void CMock_Verify(void) +{ + Mockstanky_Verify(); +} +static void CMock_Destroy(void) +{ + Mockstanky_Destroy(); +} + +//=======Suite Setup===== +static int suite_setup(void) +{ +a_yaml_setup(); +} + +//=======Test Reset Option===== +void resetTest() +{ + CMock_Verify(); + CMock_Destroy(); + tearDown(); + CMock_Init(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + suite_setup(); + Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return (UnityEnd()); +} diff --git a/test/expectdata/testsample_new1.c b/test/expectdata/testsample_new1.c index ce0922d..56b148b 100644 --- a/test/expectdata/testsample_new1.c +++ b/test/expectdata/testsample_new1.c @@ -1,60 +1,63 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CEXCEPTION_T e; \ - Try { \ - setUp(); \ - TestFunc(); \ - } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ - } \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include "one.h" -#include "two.h" -#include -#include -#include "CException.h" - -int GlobalExpectCount; -int GlobalVerifyOrder; -char* GlobalOrderError; - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Test Reset Option===== -void resetTest() -{ - tearDown(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - Unity.TestFile = "test/testdata/testsample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CEXCEPTION_T e; \ + Try { \ + setUp(); \ + TestFunc(); \ + } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ + } \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include "one.h" +#include "two.h" +#include +#include +#include "CException.h" +#include "funky.h" +#include "stanky.h" +#include + +int GlobalExpectCount; +int GlobalVerifyOrder; +char* GlobalOrderError; + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Test Reset Option===== +void resetTest() +{ + tearDown(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return (UnityEnd()); +} diff --git a/test/expectdata/testsample_new2.c b/test/expectdata/testsample_new2.c index fdbbef3..be591b3 100644 --- a/test/expectdata/testsample_new2.c +++ b/test/expectdata/testsample_new2.c @@ -1,63 +1,66 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - setUp(); \ - TestFunc(); \ - } \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include -#include - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Suite Setup===== -static int suite_setup(void) -{ -a_custom_setup(); -} - -//=======Suite Teardown===== -static int suite_teardown(int num_failures) -{ -a_custom_teardown(); -} - -//=======Test Reset Option===== -void resetTest() -{ - tearDown(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - suite_setup(); - Unity.TestFile = "test/testdata/testsample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return suite_teardown(UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + setUp(); \ + TestFunc(); \ + } \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include +#include +#include "funky.h" +#include "stanky.h" +#include + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Suite Setup===== +static int suite_setup(void) +{ +a_custom_setup(); +} + +//=======Suite Teardown===== +static int suite_teardown(int num_failures) +{ +a_custom_teardown(); +} + +//=======Test Reset Option===== +void resetTest() +{ + tearDown(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + suite_setup(); + Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return suite_teardown(UnityEnd()); +} diff --git a/test/expectdata/testsample_param.c b/test/expectdata/testsample_param.c index 8865880..df4a693 100644 --- a/test/expectdata/testsample_param.c +++ b/test/expectdata/testsample_param.c @@ -1,51 +1,54 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST_NO_ARGS -#define RUN_TEST(TestFunc, TestLineNum, ...) \ -{ \ - Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - setUp(); \ - TestFunc(__VA_ARGS__); \ - } \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include -#include - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Test Reset Option===== -void resetTest() -{ - tearDown(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - Unity.TestFile = "test/testdata/testsample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS); - RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST_NO_ARGS +#define RUN_TEST(TestFunc, TestLineNum, ...) \ +{ \ + Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + setUp(); \ + TestFunc(__VA_ARGS__); \ + } \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include +#include +#include "funky.h" +#include "stanky.h" +#include + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Test Reset Option===== +void resetTest() +{ + tearDown(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS); + RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS); + + return (UnityEnd()); +} diff --git a/test/expectdata/testsample_run1.c b/test/expectdata/testsample_run1.c index ce0922d..56b148b 100644 --- a/test/expectdata/testsample_run1.c +++ b/test/expectdata/testsample_run1.c @@ -1,60 +1,63 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CEXCEPTION_T e; \ - Try { \ - setUp(); \ - TestFunc(); \ - } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ - } \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include "one.h" -#include "two.h" -#include -#include -#include "CException.h" - -int GlobalExpectCount; -int GlobalVerifyOrder; -char* GlobalOrderError; - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Test Reset Option===== -void resetTest() -{ - tearDown(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - Unity.TestFile = "test/testdata/testsample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CEXCEPTION_T e; \ + Try { \ + setUp(); \ + TestFunc(); \ + } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ + } \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include "one.h" +#include "two.h" +#include +#include +#include "CException.h" +#include "funky.h" +#include "stanky.h" +#include + +int GlobalExpectCount; +int GlobalVerifyOrder; +char* GlobalOrderError; + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Test Reset Option===== +void resetTest() +{ + tearDown(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return (UnityEnd()); +} diff --git a/test/expectdata/testsample_run2.c b/test/expectdata/testsample_run2.c index fdbbef3..be591b3 100644 --- a/test/expectdata/testsample_run2.c +++ b/test/expectdata/testsample_run2.c @@ -1,63 +1,66 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - setUp(); \ - TestFunc(); \ - } \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include -#include - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Suite Setup===== -static int suite_setup(void) -{ -a_custom_setup(); -} - -//=======Suite Teardown===== -static int suite_teardown(int num_failures) -{ -a_custom_teardown(); -} - -//=======Test Reset Option===== -void resetTest() -{ - tearDown(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - suite_setup(); - Unity.TestFile = "test/testdata/testsample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return suite_teardown(UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + setUp(); \ + TestFunc(); \ + } \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include +#include +#include "funky.h" +#include "stanky.h" +#include + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Suite Setup===== +static int suite_setup(void) +{ +a_custom_setup(); +} + +//=======Suite Teardown===== +static int suite_teardown(int num_failures) +{ +a_custom_teardown(); +} + +//=======Test Reset Option===== +void resetTest() +{ + tearDown(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + suite_setup(); + Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return suite_teardown(UnityEnd()); +} diff --git a/test/expectdata/testsample_yaml.c b/test/expectdata/testsample_yaml.c index eb25bc9..9198105 100644 --- a/test/expectdata/testsample_yaml.c +++ b/test/expectdata/testsample_yaml.c @@ -1,64 +1,67 @@ -/* AUTOGENERATED FILE. DO NOT EDIT. */ - -//=======Test Runner Used To Run Each Test Below===== -#define RUN_TEST(TestFunc, TestLineNum) \ -{ \ - Unity.CurrentTestName = #TestFunc; \ - Unity.CurrentTestLineNumber = TestLineNum; \ - Unity.NumberOfTests++; \ - if (TEST_PROTECT()) \ - { \ - CEXCEPTION_T e; \ - Try { \ - setUp(); \ - TestFunc(); \ - } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ - } \ - if (TEST_PROTECT() && !TEST_IS_IGNORED) \ - { \ - tearDown(); \ - } \ - UnityConcludeTest(); \ -} - -//=======Automagically Detected Files To Include===== -#include "unity.h" -#include "two.h" -#include "three.h" -#include -#include -#include -#include "CException.h" - -//=======External Functions This Runner Calls===== -extern void setUp(void); -extern void tearDown(void); -extern void test_TheFirstThingToTest(void); -extern void test_TheSecondThingToTest(void); - - -//=======Suite Setup===== -static int suite_setup(void) -{ -a_yaml_setup(); -} - -//=======Test Reset Option===== -void resetTest() -{ - tearDown(); - setUp(); -} - - -//=======MAIN===== -int main(void) -{ - suite_setup(); - Unity.TestFile = "test/testdata/testsample.c"; - UnityBegin(); - RUN_TEST(test_TheFirstThingToTest, 21); - RUN_TEST(test_TheSecondThingToTest, 43); - - return (UnityEnd()); -} +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +//=======Test Runner Used To Run Each Test Below===== +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + CEXCEPTION_T e; \ + Try { \ + setUp(); \ + TestFunc(); \ + } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \ + } \ + if (TEST_PROTECT() && !TEST_IS_IGNORED) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +//=======Automagically Detected Files To Include===== +#include "unity.h" +#include "two.h" +#include "three.h" +#include +#include +#include +#include "CException.h" +#include "funky.h" +#include "stanky.h" +#include + +//=======External Functions This Runner Calls===== +extern void setUp(void); +extern void tearDown(void); +extern void test_TheFirstThingToTest(void); +extern void test_TheSecondThingToTest(void); + + +//=======Suite Setup===== +static int suite_setup(void) +{ +a_yaml_setup(); +} + +//=======Test Reset Option===== +void resetTest() +{ + tearDown(); + setUp(); +} + + +//=======MAIN===== +int main(void) +{ + suite_setup(); + Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin(); + RUN_TEST(test_TheFirstThingToTest, 21); + RUN_TEST(test_TheSecondThingToTest, 43); + + return (UnityEnd()); +} From 3399bba27b24e461c3341279656794581b955848 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sun, 22 Sep 2013 12:10:42 -0400 Subject: [PATCH 8/8] - merged in changes by TheGreenDroid to reduce Lint and Compiler warnings --- extras/fixture/src/unity_fixture.h | 33 ++++++++--------- src/unity.c | 58 +++++++++++++++--------------- src/unity_internals.h | 38 ++++++++++---------- 3 files changed, 65 insertions(+), 64 deletions(-) diff --git a/extras/fixture/src/unity_fixture.h b/extras/fixture/src/unity_fixture.h index 9d5cd12..3f54c14 100644 --- a/extras/fixture/src/unity_fixture.h +++ b/extras/fixture/src/unity_fixture.h @@ -13,40 +13,40 @@ #include "unity_fixture_malloc_overrides.h" #include "unity_fixture_internals.h" -int UnityMain(int argc, char* argv[], void (*runAllTests)()); +int UnityMain(int argc, char* argv[], void (*runAllTests)(void)); #define TEST_GROUP(group)\ - int TEST_GROUP_##group = 0 + static const char* TEST_GROUP_##group = #group -#define TEST_SETUP(group) void TEST_##group##_SETUP() +#define TEST_SETUP(group) void TEST_##group##_SETUP(void) -#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN() +#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN(void) #define TEST(group, name) \ - void TEST_##group##_##name##_();\ - void TEST_##group##_##name##_run()\ + void TEST_##group##_##name##_(void);\ + void TEST_##group##_##name##_run(void)\ {\ UnityTestRunner(TEST_##group##_SETUP,\ - TEST_##group##_##name##_,\ + TEST_##group##_##name##_,\ TEST_##group##_TEAR_DOWN,\ "TEST(" #group ", " #name ")",\ - #group, #name,\ + TEST_GROUP_##group, #name,\ __FILE__, __LINE__);\ }\ - void TEST_##group##_##name##_() + void TEST_##group##_##name##_(void) #define IGNORE_TEST(group, name) \ - void TEST_##group##_##name##_();\ - void TEST_##group##_##name##_run()\ + void TEST_##group##_##name##_(void);\ + void TEST_##group##_##name##_run(void)\ {\ UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")");\ }\ - void TEST_##group##_##name##_() + void TEST_##group##_##name##_(void) #define DECLARE_TEST_CASE(group, name) \ - void TEST_##group##_##name##_run() + void TEST_##group##_##name##_run(void) #define RUN_TEST_CASE(group, name) \ { DECLARE_TEST_CASE(group, name);\ @@ -54,8 +54,9 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)()); //This goes at the bottom of each test file or in a separate c file #define TEST_GROUP_RUNNER(group)\ - void TEST_##group##_GROUP_RUNNER_runAll();\ - void TEST_##group##_GROUP_RUNNER()\ + void TEST_##group##_GROUP_RUNNER_runAll(void);\ + void TEST_##group##_GROUP_RUNNER(void);\ + void TEST_##group##_GROUP_RUNNER(void)\ {\ TEST_##group##_GROUP_RUNNER_runAll();\ }\ @@ -63,7 +64,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)()); //Call this from main #define RUN_TEST_GROUP(group)\ - { void TEST_##group##_GROUP_RUNNER();\ + { void TEST_##group##_GROUP_RUNNER(void);\ TEST_##group##_GROUP_RUNNER(); } //CppUTest Compatibility Macros diff --git a/src/unity.c b/src/unity.c index 6cd77e1..138978c 100644 --- a/src/unity.c +++ b/src/unity.c @@ -42,7 +42,7 @@ static const _UD d_zero = 0.0; #endif // compiler-generic print formatting masks -const _U_UINT UnitySizeMask[] = +const _U_UINT UnitySizeMask[] = { 255u, // 0xFF 65535u, // 0xFFFF @@ -308,7 +308,7 @@ void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual } else { - UnityPrint(UnityStrNull); + UnityPrint(UnityStrNull); } UnityPrint(UnityStrWas); if (actual != NULL) @@ -319,7 +319,7 @@ void UnityPrintExpectedAndActualStrings(const char* expected, const char* actual } else { - UnityPrint(UnityStrNull); + UnityPrint(UnityStrNull); } } @@ -332,7 +332,7 @@ int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_ //return true if they are both NULL if ((expected == NULL) && (actual == NULL)) return 1; - + //throw error if just expected is NULL if (expected == NULL) { @@ -350,7 +350,7 @@ int UnityCheckArraysForNull(UNITY_PTR_ATTRIBUTE const void* expected, UNITY_PTR_ UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } - + //return false if neither is NULL return 0; } @@ -366,7 +366,7 @@ void UnityAssertBits(const _U_SINT mask, const UNITY_LINE_TYPE lineNumber) { UNITY_SKIP_EXECUTION; - + if ((mask & expected) != (mask & actual)) { UnityTestResultsFailBegin(lineNumber); @@ -401,8 +401,8 @@ void UnityAssertEqualNumber(const _U_SINT expected, } //----------------------------------------------- -void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const _U_SINT* expected, - UNITY_PTR_ATTRIBUTE const _U_SINT* actual, +void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected, + UNITY_PTR_ATTRIBUTE const void* actual, const _UU32 num_elements, const char* msg, const UNITY_LINE_TYPE lineNumber, @@ -413,7 +413,7 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const _U_SINT* expected, UNITY_PTR_ATTRIBUTE const _US8* ptr_act = (UNITY_PTR_ATTRIBUTE _US8*)actual; UNITY_SKIP_EXECUTION; - + if (elements == 0) { UnityTestResultsFailBegin(lineNumber); @@ -421,7 +421,7 @@ void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const _U_SINT* expected, UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } - + if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) return; @@ -531,7 +531,7 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected, _UF diff, tol; UNITY_SKIP_EXECUTION; - + if (elements == 0) { UnityTestResultsFailBegin(lineNumber); @@ -539,7 +539,7 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected, UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } - + if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) return; @@ -551,7 +551,7 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const _UF* expected, tol = UNITY_FLOAT_PRECISION * *ptr_expected; if (tol < 0.0f) tol = 0.0f - tol; - + //This first part of this condition will catch any NaN or Infinite values if ((diff * 0.0f != 0.0f) || (diff > tol)) { @@ -585,7 +585,7 @@ void UnityAssertFloatsWithin(const _UF delta, _UF pos_delta = delta; UNITY_SKIP_EXECUTION; - + if (diff < 0.0f) { diff = 0.0f - diff; @@ -703,7 +703,7 @@ void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected, _UD diff, tol; UNITY_SKIP_EXECUTION; - + if (elements == 0) { UnityTestResultsFailBegin(lineNumber); @@ -711,7 +711,7 @@ void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected, UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } - + if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) return; @@ -723,7 +723,7 @@ void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const _UD* expected, tol = UNITY_DOUBLE_PRECISION * *ptr_expected; if (tol < 0.0) tol = 0.0 - tol; - + //This first part of this condition will catch any NaN or Infinite values if ((diff * 0.0 != 0.0) || (diff > tol)) { @@ -757,7 +757,7 @@ void UnityAssertDoublesWithin(const _UD delta, _UD pos_delta = delta; UNITY_SKIP_EXECUTION; - + if (diff < 0.0) { diff = 0.0 - diff; @@ -866,7 +866,7 @@ void UnityAssertNumbersWithin( const _U_SINT delta, const UNITY_DISPLAY_STYLE_T style) { UNITY_SKIP_EXECUTION; - + if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT) { if (actual > expected) @@ -905,7 +905,7 @@ void UnityAssertEqualString(const char* expected, _UU32 i; UNITY_SKIP_EXECUTION; - + // if both pointers not null compare the strings if (expected && actual) { @@ -943,9 +943,9 @@ void UnityAssertEqualStringArray( const char** expected, const UNITY_LINE_TYPE lineNumber) { _UU32 i, j = 0; - + UNITY_SKIP_EXECUTION; - + // if no elements, it's an error if (num_elements == 0) { @@ -957,7 +957,7 @@ void UnityAssertEqualStringArray( const char** expected, if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) return; - + do { // if both pointers not null compare the strings @@ -991,7 +991,7 @@ void UnityAssertEqualStringArray( const char** expected, UnityPrintExpectedAndActualStrings((const char*)(expected[j]), (const char*)(actual[j])); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; - } + } } while (++j < num_elements); } @@ -1009,7 +1009,7 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected, _UU32 bytes; UNITY_SKIP_EXECUTION; - + if ((elements == 0) || (length == 0)) { UnityTestResultsFailBegin(lineNumber); @@ -1020,7 +1020,7 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected, if (UnityCheckArraysForNull((UNITY_PTR_ATTRIBUTE void*)expected, (UNITY_PTR_ATTRIBUTE void*)actual, lineNumber, msg) == 1) return; - + while (elements--) { ///////////////////////////////////// @@ -1049,7 +1049,7 @@ void UnityAssertEqualMemory( UNITY_PTR_ATTRIBUTE const void* expected, ptr_act += 1; } ///////////////////////////////////// - + } } @@ -1068,7 +1068,7 @@ void UnityFail(const char* msg, const UNITY_LINE_TYPE line) UNITY_OUTPUT_CHAR(':'); if (msg[0] != ' ') { - UNITY_OUTPUT_CHAR(' '); + UNITY_OUTPUT_CHAR(' '); } UnityPrint(msg); } @@ -1098,7 +1098,7 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int { Unity.CurrentTestName = FuncName; Unity.CurrentTestLineNumber = FuncLineNum; - Unity.NumberOfTests++; + Unity.NumberOfTests++; if (TEST_PROTECT()) { setUp(); diff --git a/src/unity_internals.h b/src/unity_internals.h index 484b383..85642f5 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -181,7 +181,7 @@ typedef _US64 _U_SINT; // Float Support //------------------------------------------------------- -#ifdef UNITY_EXCLUDE_FLOAT +#ifdef UNITY_EXCLUDE_FLOAT //No Floating Point Support #undef UNITY_FLOAT_PRECISION @@ -198,7 +198,7 @@ typedef _US64 _U_SINT; #define UNITY_FLOAT_TYPE float #endif typedef UNITY_FLOAT_TYPE _UF; - + #endif //------------------------------------------------------- @@ -212,7 +212,7 @@ typedef UNITY_FLOAT_TYPE _UF; #endif #endif -#ifdef UNITY_EXCLUDE_DOUBLE +#ifdef UNITY_EXCLUDE_DOUBLE //No Floating Point Support #undef UNITY_DOUBLE_PRECISION @@ -223,13 +223,13 @@ typedef UNITY_FLOAT_TYPE _UF; //Floating Point Support #ifndef UNITY_DOUBLE_PRECISION -#define UNITY_DOUBLE_PRECISION (1e-12f) +#define UNITY_DOUBLE_PRECISION (1e-12f) #endif #ifndef UNITY_DOUBLE_TYPE #define UNITY_DOUBLE_TYPE double #endif typedef UNITY_DOUBLE_TYPE _UD; - + #endif //------------------------------------------------------- @@ -358,8 +358,8 @@ void UnityAssertEqualNumber(const _U_SINT expected, const UNITY_LINE_TYPE lineNumber, const UNITY_DISPLAY_STYLE_T style); -void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const _U_SINT* expected, - UNITY_PTR_ATTRIBUTE const _U_SINT* actual, +void UnityAssertEqualIntArray(UNITY_PTR_ATTRIBUTE const void* expected, + UNITY_PTR_ATTRIBUTE const void* actual, const _UU32 num_elements, const char* msg, const UNITY_LINE_TYPE lineNumber, @@ -490,18 +490,18 @@ void UnityAssertDoubleIsNaN(const _UD actual, #define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message) UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)line) #define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message) UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE void*)(expected), (UNITY_PTR_ATTRIBUTE void*)(actual), (_UU32)(len), 1, (message), (UNITY_LINE_TYPE)line) -#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT32) -#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT8) -#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT16) -#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(expected), (UNITY_PTR_ATTRIBUTE const _U_SINT*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const _U_SINT*)(_UP*)(expected), (const _U_SINT*)(_UP*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER) +#define UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT) +#define UNITY_TEST_ASSERT_EQUAL_INT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT8) +#define UNITY_TEST_ASSERT_EQUAL_INT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT16) +#define UNITY_TEST_ASSERT_EQUAL_INT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_INT32) +#define UNITY_TEST_ASSERT_EQUAL_UINT_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT) +#define UNITY_TEST_ASSERT_EQUAL_UINT8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT8) +#define UNITY_TEST_ASSERT_EQUAL_UINT16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT16) +#define UNITY_TEST_ASSERT_EQUAL_UINT32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_UINT32) +#define UNITY_TEST_ASSERT_EQUAL_HEX8_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX8) +#define UNITY_TEST_ASSERT_EQUAL_HEX16_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX16) +#define UNITY_TEST_ASSERT_EQUAL_HEX32_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(expected), (UNITY_PTR_ATTRIBUTE const void*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_HEX32) +#define UNITY_TEST_ASSERT_EQUAL_PTR_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_PTR_ATTRIBUTE const void*)(_UP*)(expected), (const void*)(_UP*)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line, UNITY_DISPLAY_STYLE_POINTER) #define UNITY_TEST_ASSERT_EQUAL_STRING_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualStringArray((const char**)(expected), (const char**)(actual), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line) #define UNITY_TEST_ASSERT_EQUAL_MEMORY_ARRAY(expected, actual, len, num_elements, line, message) UnityAssertEqualMemory((UNITY_PTR_ATTRIBUTE void*)(expected), (UNITY_PTR_ATTRIBUTE void*)(actual), (_UU32)(len), (_UU32)(num_elements), (message), (UNITY_LINE_TYPE)line)