256 Commits

Author SHA1 Message Date
06c2a3f7a6 Merge pull request #66 from ThrowTheSwitch/bug/print_styles
fixed format tags for u/int assertions
2014-03-07 15:36:49 -05:00
8f6f34f98a fixed format tags for u/int assertions 2014-03-07 15:31:52 -05:00
4d2c2a5e82 Merge pull request #65 from ThrowTheSwitch/bug/init
Fixed initialization of data structure
2014-03-07 15:18:56 -05:00
f1c778e100 Fixed initialization of data structure by just doing it manually instead of statically (goodbye compiler warnings!) 2014-03-07 15:17:25 -05:00
291c2980e0 Merge pull request #62 from anthonyboorsma/master
fixed casts in UNITY_TEST_ASSERT_EQUAL_UINT*.  (Thanks Anthony)
2014-03-07 14:47:26 -05:00
a3153610f3 Merge pull request #58 from ThrowTheSwitch/bug/double_handling
fixed double calls to actually use double handler instead of float handler
2014-03-07 14:08:04 -05:00
6a273e081c Merge pull request #57 from ThrowTheSwitch/bug/encoding
Support different encoding styles and force to something we can work with
2014-03-07 14:07:30 -05:00
9ddfa74a7e fixed casts in UNITY_TEST_ASSERT_EQUAL_UINT*. Was previously casting to signed variables and then sign extending the value before casting to final uint and was causing errorneous test failures when executed on arm target 2014-03-06 09:35:32 -05:00
9a393a28d5 Merge pull request #50 from uozuAho/master
Added more examples
2014-02-28 16:52:34 -05:00
8c5456059f Merge pull request #34 from hoodja/master
Unknown CLI params get ignored
2014-02-28 16:42:35 -05:00
701ee5101d fixed another double-float issue: make sure doubles are not both included and excluded. 2014-02-28 15:57:37 -05:00
bd0d5ecf29 more tweaks (cast to the right type) 2014-02-28 15:47:11 -05:00
60f0c1a8ae fixed double calls to actually use double handler instead of float handler 2014-02-28 15:25:02 -05:00
d3c18c26ad support different encoding styles and force to something we can work with. 2014-02-28 10:37:47 -05:00
aa36e5556b Merge pull request #56 from holderbaum/master
Print an EOL before printing the TestResult while executing the spec (Thanks Jakob!)
2014-02-24 16:29:19 -05:00
5fbc23e856 Print an EOL before printing the TestResult while executing the spec
By printing this newline, the filepath of the failing assertion does not get
preceded by the dot which represents a running test.

This gives the advantage, that the complete output of unity can be used as it is
with a makefile in vim. Every error gets displayed in the quickfix and you can
jump appropiately.
2014-02-16 11:13:38 +01:00
a18b894618 Merge pull request #55 from Jcarnage/master
Initial import of report parser.
2013-12-20 06:48:38 -08:00
5cdd6b6778 Initial import of report parser.
This parser will scan an output file, pull all Unity related tests and summarize them in a report to console or put them in an XML file for use with Jenkins
2013-12-20 07:59:47 -05:00
854b68b110 Merge remote-tracking branch 'upstream/master'
Conflicts:
	examples/example_3/makefile
2013-11-05 21:28:11 +11:00
d9ac0e1077 Merge branch 'master' of https://github.com/ThrowTheSwitch/Unity 2013-09-22 12:53:21 -04:00
a8ad38b2e5 Merge pull request #37 from sdhawley/master
build on cygwin
2013-09-22 09:29:25 -07:00
3399bba27b - merged in changes by TheGreenDroid to reduce Lint and Compiler warnings 2013-09-22 12:10:42 -04:00
72c55e0266 - Fixed script tests to match Shelly's changes 2013-09-22 11:53:48 -04:00
635884b08a Merge branch 'master' of https://github.com/ThrowTheSwitch/Unity 2013-09-22 11:40:02 -04:00
f5e2ed7648 Merge pull request #44 from shellyniz/master
copy include statements from test file to test runner (excluding cmock.h and unity.h) to better handle custom types in parameterized tests (Thanks Shelly)
2013-09-22 08:15:28 -07:00
ff1339ca5a - Fixed a gcc warning when -Wall enabled. (Thanks gjcamann) 2013-09-22 10:58:36 -04:00
dddf13595d Merge pull request #51 from canton7/feature/ptr-attribute
Allow pointer types to have an attribute (file under "stupid things we do to keep poor compilers happy")
2013-09-17 04:26:48 -07:00
79ea2883a9 Merge pull request #46 from canton7/feature/hex-array-test-fixes
Fix unit tests for TEST_ASSERT_EQUAL_HEX_ARRAY on 16-bit architectures (Thanks Antony!)
2013-09-17 04:19:10 -07:00
6dd44f23c9 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.
2013-09-17 10:10:43 +01:00
e4727092e8 Added Eclipse error parsers 2013-09-05 19:12:26 +10:00
8ca802d4dc Updated examples
*  Renamed example x to example 3
2013-07-19 21:30:35 +10:00
d27699d97a Updated examples
*  Updated example 2 readme
 *  Broke up huge line in example 2 makefile
2013-07-17 23:27:25 +10:00
efc1df828f Added example
*  Added example that uses unity test fixture
2013-07-17 23:23:09 +10:00
1b9b197298 Added another example
*  Simple makefile example, extracted from existing example
2013-07-17 22:48:50 +10:00
5932565bae Updated example
*  Moved existing example to its own directory, with the intention of adding more examples
 *  Existing example uses its own .yml file instead of one of the files in targets/.
2013-07-17 22:42:43 +10:00
843370a7c2 Updated example makefile
*  Make would fail due to missing build directory. Now it doesn't try to delete build/
2013-07-17 22:14:47 +10:00
29812f3f5b Merge pull request #49 from uozuAho/master
Fixed examples build error (rake)
2013-07-14 13:20:26 -07:00
53a5ae92c1 Updated examples rakefile
*  Build directory created if it doesn't exist. This fixes a gcc "no such file or directory" error when running rake
2013-07-14 20:37:39 +10:00
6f49140354 Merge pull request #47 from canton7/feature/memory-array-test-fixes
Fix tests testing TEST_ASSERT_EQUAL_MEMORY_ARRAY on 16-bit platforms. (Thanks Antony!)
2013-06-28 04:50:42 -07:00
6bff2eb938 Merge pull request #45 from canton7/feature/16bitIntArrayEqual
Fix TEST_ASSERT_EQUAL_INT_ARRAY for int sizes other than 32 bits (Thanks Canton7)
2013-06-28 04:49:09 -07:00
2b484e4239 Fix tests testing TEST_ASSERT_EQUAL_MEMORY_ARRAY on 16-bit platforms
The tests which exercise TEST_ASSERT_EQUAL_MEMORY_ARRAY use int arrays,
and hard-code the size of each element as 4 bytes. This is of course
untrue on 16-bit platforms.

Replace this hard-coded value with sizeof(int).
2013-06-28 11:12:59 +01:00
318dc8f35a 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'.
2013-06-28 10:59:23 +01:00
07736afe63 Fix TEST_ASSERT_EQUAL_INT_ARRAY for int sizes other than 32 bits
This patch fixes testEqualIntArrays in the unity test suite on 16-bit
architectures.

TEST_ASSERT_EQUAL_INT_ARRAY calls UnityAssertEqualIntArray with 'style'
set to UNITY_DISPLAY_STYLE_INT.

UNITY_DISPLAY_STYLE_INT is defined as UNITY_DISPLAY_STYLE_AUTO +
UNITY_DISPLAY_STYLE_INT{16,32,64} (depending on the int width).

However, the switch statement in UnityAssertEqualIntArray has special
cases for the width-specific display styles, but these comparisons
are carried out without clearing the UNITY_DISPLAY_STYLE_AUTO flag.
This means that if 'style' is UNITY_DISPLAY_STYLE_INT, and the int
width is, say, 16, bits, the default case will be hit, and elements
compared as if they were 32 bits wide. Unsurprisingly this causes
a failure in the test named above.
2013-06-28 09:34:49 +01:00
4460fc50f1 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
2013-06-21 20:23:24 +03:00
19c405ff95 One more edit to build under cygwin 2013-04-12 15:01:13 -05:00
c54145145f A small change to the makefile so that it builds in a cygwin environment 2013-04-12 13:18:32 -05:00
770789e9c1 Merge pull request #36 from aguegu/master
fix bug in target execsion in example makefile
2013-03-25 06:23:22 -07:00
356b43d1c2 add './' to in example makefile, since . may not be included in PATH 2013-03-25 16:05:30 +08:00
12d3d8eebc Merge branch 'master' of https://github.com/ThrowTheSwitch/Unity 2013-03-04 21:22:09 -06:00
5e401afa83 updating CLI for unity_fixture.h to handle unknown command line arguments (instead of entering an infinite loop) 2013-03-04 14:35:18 -06:00