Commit Graph

1038 Commits

Author SHA1 Message Date
Max Bruckner
1285e6ac68 README: new doc: Printing 2017-12-31 01:35:07 +01:00
Max Bruckner
b54b81251e README: new doc: Parsing 2017-12-31 01:35:05 +01:00
Max Bruckner
c31ee79ad1 README: new doc: Data Structure section 2017-12-31 01:26:41 +01:00
Max Bruckner
a1a1e60cb0
Merge pull request #226 from DaveGamble/boolean_add
Convert cJSON_Add..ToObject macros into functions with return values
2017-12-29 23:30:20 +01:00
Max Bruckner
1b21bcd150 cJSON_Add..ToObject: Add comment to header file 2017-12-29 23:29:09 +01:00
Max Bruckner
77931e7fc0 cJSON_Add...ToObject: Add tests for failure conditions 2017-12-29 23:26:53 +01:00
Max Bruckner
5865faffa3 Convert cJSON_Add...ToObject macros into functions
These functions return the added object. Functions to add objects and
arrays have also been added.
2017-12-28 23:56:39 +01:00
Max Bruckner
f966409b33 Add tests for cJSON_Add...ToObject macros 2017-12-28 22:56:57 +01:00
Max Bruckner
de729a1635 Extract add_item_to_object function that returns a boolean 2017-12-28 21:40:24 +01:00
Max Bruckner
55c597c719 add_item_to_array with boolean return value 2017-12-28 12:45:28 +01:00
Max Bruckner
2a087843e4 Add overrides for BUILD_SHARED_LIBS 2017-11-28 17:16:11 +01:00
Max Bruckner
eb7c681a4b Fix tests when building as static library 2017-11-28 16:44:24 +01:00
Max Bruckner
0476590a0c Update Unity to 2.4.3 2017-11-28 03:15:50 +01:00
Max Bruckner
da8c48668d Squashed 'tests/unity/' changes from 60b13f0..287e076
287e076 Post release
774da10 Merge pull request #296 from jlindgren90/master
629b86d Merge unity_setup.h into unity.h.
0914d80 Merge pull request #308 from codehearts/patch-1
5ee55fe Fix missing TEST_ASSERT_EACH_EQUAL_HEX_MESSAGE
38c387b Merge pull request #304 from VLambret/master
17d4ea9 Color test results using ANSI escape codes
031b1ba Merge pull request #300 from jsalling/bugfix/greater-than
df78aad Make weak symbol usage more portable:
a7e8797 Fix link errors with MinGW.
94a3008 Update continuous integration to build 32-bit Unity
b119919 Add 64-bit comparison asserts
91bcbe1 Add 'greater/less or equal to' asserts on integers
8caade7 Fix bug in greater/less than asserts on unsigned int
1381a1a Update documentation.
2593c31 Allow suiteSetUp() and suiteTearDown() to be provided as normal C functions.
60def10 Update configuration docs

git-subtree-dir: tests/unity
git-subtree-split: 287e076962ec711cd2bdf08364a8df9ce51e106b
2017-11-28 03:15:50 +01:00
Max Bruckner
11844dd5a6 Add cJSON_Create{Array,Object}Reference 2017-11-28 03:06:02 +01:00
Max Bruckner
1f543f0e28 cast_away_const: Generalize for void* 2017-11-28 02:05:02 +01:00
Max Bruckner
eaa90a6b74 Add cJSON_CreateStringReference 2017-11-28 02:02:55 +01:00
Max Bruckner
440390a9a5 extract function cast_away_const_from_string 2017-11-28 01:54:21 +01:00
Max Bruckner
2718d30a3d Squashed 'tests/json-patch-tests/' changes from 0dd0fbc..99264bb
99264bb Merge pull request #37 from FormAPI/missing_parent_key
c2fae3a Added a test case to check replace op with a missing parent key

git-subtree-dir: tests/json-patch-tests
git-subtree-split: 99264bb634d32c03df7472f21afb7d3681d8619e
2017-11-20 22:04:57 +01:00
Max Bruckner
043507872e Update json-patch-tests 2017-11-20 22:04:57 +01:00
Max Bruckner
b2afbd3c9f cJSON_GetStringValue 2017-11-15 18:47:49 +01:00
Max Bruckner
27a4303f87 Contributors: Add yangfl 2017-11-04 14:26:50 +01:00
Max Bruckner
b5f2e5c540
Merge pull request #212 from yangfl/temp2
Remove trailing space
2017-11-04 14:24:47 +01:00
yangfl
fa00278f66 Remove trailing space 2017-11-04 21:19:15 +08:00
Max Bruckner
8412b1e2cd README: fixup last commit 2017-11-04 13:42:20 +01:00
Max Bruckner
35907223e1 README: Explain including cJSON, fix #211 2017-11-04 13:39:58 +01:00
Max Bruckner
8a11f8ce17
Merge pull request #210 from yangfl/upstream
CMakeLists.txt: swap GNUInstallDirs and project
2017-11-04 13:30:59 +01:00
yangfl
df1c49dba1 CMakeLists.txt: swap GNUInstallDirs and project 2017-11-04 20:14:56 +08:00
Max Bruckner
c083421f40 Release version 1.6.0 2017-10-08 23:36:41 +02:00
Max Bruckner
96c33e5abb ENABLE_LOCALES: Actually disable the include as well 2017-10-08 23:28:49 +02:00
Max Bruckner
f437767fa9 Contributors: Add Simon Ricaldone and Casperinous 2017-10-08 23:13:30 +02:00
Max Bruckner
c51a19be51 CONTRIBUTING.md: Fix '4 tabs' -> '4 spaces' 2017-10-08 22:05:19 +02:00
Max Bruckner
97d7347a6e Merge branch 'develop' 2017-10-08 22:05:02 +02:00
Max Bruckner
28328a0b34 Merge pull request #203 from Casperinous/master
Fix for #202 issue.
2017-10-08 21:48:46 +02:00
casperinous
9b960fa870 Small indentation fix in order to follow the contribution rules. 2017-10-08 22:02:52 +03:00
casperinous
4f9e9dfc30 Fix for issue #202, regarding the lack of implementation of the localeconv method in some SDK's.
A macro named `ENABLE_LOCALES` was added and an option with the same name too in the CMakeLists.txt
2017-10-08 21:55:58 +03:00
Max Bruckner
b7bfe1e91a Squashed 'tests/unity/' changes from 3b69bea..60b13f0
60b13f0 Bump version in preparation of release.
f278c18 Fix bug #288 - invalid line numbers on partial name matches
bdd4cb1 Merge pull request #294 from jlindgren90/master
fcd4883 Fix compiler warning due to reusing symbol 'exp'.
05daf95 Update to match Ruby style guide
7b2ad10 Merge pull request #285 from dpostorivo/gt_lt_asserts
0547aab Merge pull request #291 from jlindgren90/master
2ae2bdb Make code C89-compliant.
dbdd168 Fix test link error.
0e7eb54 Rewrite UnityPrintFloat to match printf("%.6g").
a868b2e Merge pull request #286 from palaviv/fix-UNITY_OUTPUT_FLUSH
e56378e Add UNITY_OUTPUT_CHAR_HEADER_DECLARATION to fixture tests rakefile_helper.rb
ad37302 Add UNITY_OUTPUT_CHAR_HEADER_DECLARATION to tests rakefile_helper.rb
b3de931 Add UNITY_OUTPUT_CHAR_HEADER_DECLARATION to fixture tests Makefile defines
59182c4 Add UNITY_OUTPUT_CHAR_HEADER_DECLARATION to tests Makefile defines
a07d07c Allow specifying custom header declaration
c1bc32d - Generator will not change names by default - Fixed some style issues.
f2fdf1a Added Greater than and Less than asserts from other PR

git-subtree-dir: tests/unity
git-subtree-split: 60b13f0685246b009810aecbffafe17fb665d970
2017-09-12 18:30:07 +02:00
Max Bruckner
acf80470f8 Update Unity to version v2.4.2
Merge commit 'b7bfe1e91a0b55d72f849944d5a33b7962d7bf51' into develop
2017-09-12 18:30:07 +02:00
Max Bruckner
afd5d186b7 Release version 1.5.9 2017-09-08 13:54:24 +02:00
Max Bruckner
7456637793 CONTRIBUTORS.md: Add Robin Mallinson 2017-09-08 13:52:15 +02:00
Max Bruckner
d92754cd30 Add valgrind suppressions for ARMv7 2017-09-08 13:25:14 +02:00
Max Bruckner
e4980b65b9 Merge pull request #200 from rmallins/cJSON_ParseWithOpts_fix_ErrorPtr_behaviour
Fix error pointer behaviour of cJSON_ParseWithOpts()
2017-09-08 12:05:19 +02:00
rmallins
629c354390 Rewrite test for cJSON_ParseWithOpts() to expect non-null error
pointer in error case and change code to match new expectations.
2017-09-08 01:22:10 +01:00
rmallins
1b2236a9a6 Improve existing tests showing behaviour of Parse and ParseWithOpts functions. 2017-09-08 01:20:52 +01:00
Max Bruckner
1925d1bbe5 Release version 1.5.8 2017-08-21 11:06:10 +02:00
Max Bruckner
76b705576f Makefile: Fix 'make test'
make test tried to execute the test for cJSON_Utils, which has been
ported to CUnity tests.
2017-08-21 10:58:49 +02:00
Max Bruckner
469a437e2a Add valgrind suppressions for ARVMv7 ArchlinuxARM 2017-07-15 11:59:47 +02:00
Max Bruckner
7e2781a734 Merge pull request #187 from simon-p-r/appveyor
First commit of appveyor
2017-07-15 10:19:14 +02:00
simon-p-r
f0f3e55d48
fixed appveyor script 2017-07-15 09:06:10 +01:00
simon-p-r
2caa884f6a
removed x64 Visual Studio 9 2008 build 2017-07-15 09:03:13 +01:00