1
0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-23 08:25:58 +01:00
Commit Graph

84 Commits

Author SHA1 Message Date
Mark VanderVoord
783fcaea97 Merge pull request #205 from bryongloden/patch-2
Update unity_fixture.c (Thanks, Bryon!)
2016-08-02 14:55:42 -04:00
Bryon Gloden, CISSP®
13160e5f1e Update unity_fixture_Test.c
I believe if realloc() returns a pointer to a different location, the old location is freed. However, the pointer 'n1' is not freed if realloc fails to obtain a large enough block of memory and returns NULL. (more details on [StackOverflow](http://stackoverflow.com/a/16676964)).
2016-07-28 17:11:11 -04:00
Bryon Gloden, CISSP®
4fd5f79f28 Update unity_fixture.c
Sorry @mvandervoord -- not your code, your repository 😁

Regarding the double free, cppcheck has a check for that too (just saying) 👍
2016-07-26 19:41:30 -04:00
Bryon Gloden, CISSP®
0737b4117f Update unity_fixture.c
Free guard if UNITY_EXCLUDE_STDLIB_MALLOC is not defined. 👍

Thanks @ for the hint.
2016-07-26 16:02:41 -04:00
Bryon Gloden, CISSP®
094c05e904 Update unity_fixture_Test.c
[../Unity-master/extras/fixture/test/unity_fixture_Test.c:530]: (error) Deallocating a deallocated pointer: n1

This solution from Daniel Fischer was helpful in fixing the error because if realloc returns a pointer to a different location, the old location is freed.

Found by https://github.com/bryongloden/cppcheck
2016-07-26 14:40:00 -04:00
Bryon Gloden, CISSP®
b1d8388ab8 Update unity_fixture.c
[../Unity-master/extras/fixture/src/unity_fixture.c:210]: (error) Memory leak: guard

Found by https://github.com/bryongloden/cppcheck
2016-07-26 14:19:41 -04:00
Mark VanderVoord
e3612e9a10 Update Fixtures too. 2016-05-06 10:55:41 -04:00
jsalling
94fc68942b 100% code coverage for Unity Fixture
Add tests for uncovered lines
2016-02-29 23:39:03 -06:00
jsalling
cc0f58cfbc Create coverage target in Makefile to output statement coverage with gcov 2016-02-29 23:25:39 -06:00
Mark VanderVoord
ce6f4737b2 Merge pull request #175 from jsalling/feature/C89-build
Fix C89 warnings about variables at top of scope, enums, variadic macros
2016-02-29 16:59:40 -05:00
jsalling
3bb51bd740 Fix C89 warnings about variables at top of scope, enums, variadic macros
Add extern UnityFixture in internals header. Add C89 target in Makefile
 clang will show these warnings but can suppress "//" with -Wno-comment.
2016-02-26 20:51:04 -06:00
jsalling
f8d5f0eee6 Clean up Ignore Test function in Fixture
By removing the call to the Conclude function the code is simplified
  and doesn't depend on global state updates. Tests that are ignored
  after the testBody is called still output the right EOL.
2016-02-25 13:12:22 -06:00
jsalling
f55bed38a6 Delete function call syntax from Spy detect macros
This fixes #168. See that github.com issue for more discussion.
 Allows the tests to build when putchar() is defined as a macro
  with parenthesis around it, as in the ARM embedded gcc compiler.
2016-02-25 10:41:04 -06:00
jsalling
862d5d7d3d Rename template for testing to be more fitting 2016-02-24 20:24:14 -06:00
jsalling
3faa143f21 Fix additional primitive type conversion warnings on Linux
Using gcc 4.8 on Ubuntu 14
2016-02-23 14:46:52 -06:00
jsalling
2107e7060b Variables used in Fixture tests should be static
Gets rid of warnings about extern with clang's -Weverything
2016-02-17 22:20:56 -06:00
jsalling
7b0f3cf986 Clean up conversion warnings in Fixture
Turn on -Wconversion in Makefile, fix all warnings
2016-02-17 22:17:05 -06:00
jsalling
ad14ccf26b Add strict compiler flags to Makefile and a 'clean' target
Comment out -Wconversion for now, since the build would fail
2016-02-09 14:24:00 -06:00
jsalling
5e7780fd60 Delete unused internals functions for failure, ignore, & test counts.
These wrapper functions should be in Unity core if warranted.
 Use the Unity struct directly for access, or consider macro functions
2016-02-09 10:55:07 -06:00
jsalling
943fef8a17 Fix printing the test line number for leak detection failures in Fixture
The old failure would print the line in unity_fixture.c, not very useful.
 Now using CurrentTestLineNumber, which is better.
2016-02-09 10:39:22 -06:00
jsalling
36ee2d2111 Add test for setting max number of pointers in Fixture 2016-02-09 10:36:33 -06:00
jsalling
822a537d2e Remove opaque typedef from UnityFixture struct, as done in core Unity 2016-02-08 16:53:10 -06:00
jsalling
6b664fc803 Pass through correct line info on failures in Fixture pointer setting 2016-02-08 16:52:26 -06:00
jsalling
4c384658e5 Move makefile output to build/ dir for Fixture testing 2016-02-05 21:48:23 -06:00
jsalling
189085d03a Check for writes to guard space on malloc'd buffers in Fixture
There was already some space reserved as a guard, added check for writes
 before the beginning of the buffer. Did not change the 'overrun' message.
 Underrun buffer writes are likely to be a more rare case.
2016-02-05 21:31:38 -06:00
jsalling
955b221218 Add configuration option UNITY_EXCLUDE_STDLIB_MALLOC to Fixture
This feature removes the dependency on malloc/free for constrained
  embedded systems without a heap. It uses a static heap inside
  Unity Fixture. Setting UNITY_INTERNAL_HEAP_SIZE_BYTES sizes the heap.
 Add tests for new option, add targets to makefile for running tests.
 UNITY_FIXTURE_MALLOC for Fixture use only, remove from unity_output_Spy.c.
2016-02-01 23:54:06 -06:00
jsalling
ccb29e80c2 Add NULL safety checks to Fixture allocation functions
Consistent use of one-liners and NULL
2016-01-31 23:15:00 -06:00
jsalling
e2ad88b9c0 Add checks for NULL return value to Fixture tests and spy
Help failures in the spy by adding filename and message to output
2016-01-31 22:44:45 -06:00
jsalling
63a0b98faf Remove atoi() dependency, only need stdlib.h in Fixture for malloc
For redefinition of UNITY_FIXTURE_MALLOC/...FREE use both or replace both.
 Clean up whitespace, remaining void*, and comment.
2016-01-30 22:35:59 -06:00
jsalling
34a30f8e98 Delete dangling function prototype in Fixture internals 2016-01-19 21:47:40 -06:00
jsalling
a7b60dfc88 Consistent use of * in types in the Fixture, whitespace only 2016-01-19 21:47:32 -06:00
jsalling
693417847b Remove unnecessary stdio.h dependency and clean up Fixture
Delete unused variables and empty functions
 Make setUp & tearDown (used in Unity core) optionally defined
  if 'weak' linking is present
2016-01-15 22:35:43 -06:00
Mark VanderVoord
d1111d92af Merge pull request #152 from jsalling/feature/fixture-ignore-tests-require-spy
Fixture - require spy or else ignore tests
2016-01-07 07:56:47 -05:00
jsalling
04adb2d2c9 Fix trailing whitespace CRLF, no code changes
Now that the project is using .gitattributes, get rid of CRLF in the repo.
2016-01-06 17:23:43 -06:00
jsalling
c5bfe0e100 Fixture C99 compliance on tricky macros for Spy & match core Unity version
Add CFLAGS in Fixture Makefile to catch C99 rules with '-pedantic'
2015-12-22 12:40:31 -06:00
jsalling
5cc5e3473d Add MACROs to check if tests are built using the Output Spy
Ignore tests that need the Spy if we are not building with it
2015-12-21 14:37:23 -06:00
jsalling
caa3f6663d Add Makefile to fixture/test to make building tests easier
No rake and ruby required to build existing tests
2015-12-18 17:48:35 -06:00
jsalling
c629e120e1 Fix Leak Detection always passing, but printing a fail message
Don't set CurrentTestFailed = 0 at end, move before last check
 These tests now fail if the output_Spy is not used instead of putchar()
2015-12-16 17:21:09 -06:00
jsalling
81cf5eb626 Do not add EOL after every ignored test using Unity Fixture
Revert part of commit 77af37ad, code looked like a temporary change
 The behavior is back to the original, printing "....!..." in quiet mode
 Added an ignored test to Fixture for visual inspection
2015-12-15 20:57:22 -06:00
jsalling
1703bd1a5e Reduce stack usage by removing unnecessary call from group runner in Fixture
Defining a group_runner which calls group_runner_runAll() is redundant
2015-12-15 12:05:38 -06:00
jsalling
f75f489b6e Get rid of magic numbers and strlen call for 'end' string in Fixture
Using sizeof() instead of constant 4, makes code less fragile to change
 Change name of 'guard' in Guard struct to 'guard_space'
2015-12-15 12:05:38 -06:00
Mark VanderVoord
9aeaee26c9 - Cleaned up UnitPointer_Set (thanks Eric)
- Cleaned up a casting warning error
- Removed a couple semicolons from the end of macros SHAME!
2015-12-07 21:41:44 -05:00
jsalling
de7cf8335e Transform plain macro into a function macro, UNITY_PRINT_EOL()
This helps clarity and is more obvious, it looks like a print function
2015-11-23 21:03:46 -06:00
jsalling
d4353166d2 Replace all hard-coded '\n' with UNITY_PRINT_EOL macro in fixture
Delete the { ;} braces and semicolon from UNITY_PRINT_EOL to give it expected
  behavior: 1) requires a semicolon 2) works in one-liner if-else statements
If you need "\r\n" for EOL, define as the following to get the same behavior:
  do{UNITY_OUTPUT_CHAR('\r'); UNITY_OUTPUT_CHAR('\n');}while(0)
2015-11-23 17:09:30 -06:00
Jeremy Hannon
1273112a05 MISRA rule 19.10: parentheses around macro params
Added parentheses around all macro parameters to resolve MISRA 2004
rule 19.10, "in the definition of a function-like macro, each instance
of a parameter shall be enclosed in parenthesis" as tested with the
IAR EW for 8051 compiler, version 9.20.2.

The only questionable change is in "unity_fixture.h" where the nested
macro DECLARE_TEST_CASE in RUN_TEST_CASE prevents surrounding params
"group" and "name" with parentheses.
However, it appears that macro DECLARE_TEST_CASE isn't used elsewhere,
so I eliminated DECLARE_TEST_CASE and put its expansion directly in
RUN_TEST_CASE.  Now the following header files pass rule 19.10:
* unity.h
* unity_internals.h
* unity_fixture.h

For my own project, this change to the Unity test framework allows me
to include my unit test code to be tested against MISRA rules as well,
instead of just production code, to help enforce style and team
guidelines.
2015-10-14 17:19:26 -05:00
Gergely Nagy
1affe544d2 unity_fixture: Make unity_free() NULL-safe
At the start of unity_free(), check mem for NULL, and return immediately
if it is, so we don't crash in this case. This mimics the behaviour of
most free() implementations. Closes #135.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
2015-10-06 10:44:44 +02:00
Mark VanderVoord
98e8590fce Use correct macro for unity_fixture's FAIL.
Output used headers from test runner generator
2015-08-18 08:03:50 -04:00
Mark VanderVoord
6f119a8ebd Merge pull request #122 from trianglee/get_tests_counts
Added ability to get number of ignored tests and total number of tests.
2015-07-14 16:45:55 -04:00
Nimrod Zimerman
8a5e7cce24 Added ability to get number of ignored tests and total number of tests. 2015-07-14 19:49:09 +03:00
Nimrod Zimerman
9e9adc050c Bug fix - ignored tests were incorrectly counted when not selected for running.
Ignored tests are now correctly skipped if not selected by test name or
by group name.
2015-07-14 19:29:16 +03:00