haraldwolff/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2024-07-16 03:15:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
1044 commits 12 branches 56 tags 226 MiB
Commit graph

357 commits

Author SHA1 Message Date
Niels aa7f5ad8b1 minor changes 2016-08-21 21:48:15 +02:00
Niels 585a39a235 improved branch coverage 2016-08-21 14:39:54 +02:00
Niels 628a5eae50 reset build file 2016-08-17 22:33:26 +02:00
Niels f40f81c87e forgot a semicolon 2016-08-17 21:44:53 +02:00
Niels c0922c7aac /Wall 2016-08-17 21:43:28 +02:00
Niels 35f22e8596 checking MSVC compiler flags 2016-08-17 21:38:19 +02:00
Niels 46174879ef clean up 2016-08-10 22:41:09 +02:00
Niels d02e67d4a9 coveralls with lcov 2016-08-10 20:56:26 +02:00
Niels b1c1fe9d39 added Clang 3.8 2016-08-10 16:22:53 +02:00
Niels 38f562af2a reorganization into smaller test units 2016-08-04 22:51:08 +02:00
Niels ff592c6d50 adjusted warning flags 2016-08-04 22:05:05 +02:00
Niels 91b6e223d9 adjusted capacity test cases 2016-08-04 22:04:55 +02:00
Niels d80329034e split test suite in one file per test case 2016-08-04 21:55:47 +02:00
Niels be5cf0e3ba forgot to pass CPPFLAGS 2016-08-04 07:33:44 +02:00
Niels 5541e6f6f9 split unit tests 2016-08-04 07:24:46 +02:00
Niels a05df038cd prepared release 2016-07-31 13:37:04 +02:00
Niels 148fed1e63 minor change 2016-07-25 18:06:59 +02:00
Niels a01ec918ac minor changes 2016-07-25 16:21:15 +02:00
Niels 369671f028 added more Unicode tests 2016-07-25 16:05:58 +02:00
Niels 84673b7de3 added test case from issue #283 2016-07-24 11:08:39 +02:00
Niels e2aa2d2189 improved test coverage 2016-07-24 11:01:47 +02:00
Niels 75dbbc55cf started to implement #283 2016-07-23 09:59:09 +02:00
Niels ddfe86cc49 fixed a bug that was found in the discussion of #274 2016-07-22 21:40:58 +02:00
Niels 4e7501e59a minor changes 
- fixed a bug that did not discard strings with control characters
between 0x10 and 0x1f
- added termination proofs for two important loops
- made get_ref() constexpr
 2016-07-22 15:34:45 +02:00
Niels 1286d35767 make sure precision is reset on output streams during serialization 2016-07-20 20:07:45 +02:00
Niels 28644bada0 removed std::out output from test cases 2016-07-01 17:25:56 +02:00
Niels d2475f9010 bumped version number 2016-06-28 21:44:03 +02:00
Niels 7214243d89 reset locale (for #272) 2016-06-28 19:18:23 +02:00
Niels 420659f187 addressing #272 2016-06-28 10:42:17 +02:00
Niels 0767290c26 off-by-one error in the documentation 2016-06-24 08:06:41 +02:00
Niels 04a80a8f60 Merge branch 'develop' into feature/undo-number-roundtrip 2016-06-23 05:57:41 +02:00
Niels 7cff6c8771 Merge branch 'develop' into feature/issue269 
# Conflicts:
#	README.md
 2016-06-23 00:04:55 +02:00
Niels 6f76c9237b overworked ChangeLog and README 2016-06-22 22:20:55 +02:00
Niels ecf84dddb1 test case for #269 2016-06-22 20:40:15 +02:00
Niels 90b46868b5 Merge branch 'develop' into feature/undo-number-roundtrip 2016-06-19 18:27:07 +02:00
Niels 8c48ef1f73 updated to Catch v1.5.6 2016-06-19 18:25:43 +02:00
Niels b47fdf88ee Merge branch 'develop' into feature/undo-number-roundtrip 2016-06-19 17:59:53 +02:00
Niels 4ff27b207e fixed two typos 2016-06-19 17:56:58 +02:00
Niels ad7a419a03 removed roundtripping of floats (#230) 2016-06-19 17:13:13 +02:00
Robert Marki 639d63217e Define CMake/CTest tests 
Instead of copying the test executable and the JSON files used by
the tests at install time, define CMake/CTest tests for running
the json_unit executable from any build directory with the project's
source directory as its working directory.

- call enable_testing in the main lists file to allow the definition
of tests
- remove install commands from the test directory's lists file
- define two tests
  - json_unit_default for running the default tests by executing
json_unit without any arguments
  - json_unit_all for running all the tests by executing json_unit
with the "*" argument
- update the AppVeyor configuration file to use the new testing method
 2016-05-18 11:53:49 +02:00
Chris Kitching 527a69bb64
Install the test binary and test data. Fixes #241 
The resulting install tree, when tests are enabled, looks like this:

```
.
├── cmake
│   ├── nlohmann_jsonConfig.cmake
│   ├── nlohmann_jsonConfigVersion.cmake
│   └── nlohmann_jsonTargets.cmake
├── include
│   └── nlohmann
│       └── json.hpp
└── test
    ├── bin
    │   └── json_unit
    └── data
        ├── json_nlohmann_tests
        │   ├── all_unicode.json
        │   └── bom.json
        ├── json.org
        │   ├── 1.json
        │   ├── ...
        ├── json_roundtrip
        │   ├── roundtrip01.json
        │   ├── roundtrip02.json
        │   └── ...
        ├── json_tests
        │   ├── fail10.json
        │   └── ...
        └── json_testsuite
            └── sample.json
```

It has the property that you can invoke the test binary from the
root of the install tree and the tests work correctly (you no
longer depend on the test binary being run inside the source
tree).

If tests are disabled, the entire `test/` subtree is omitted.
Notice how that yields exactly what you want for using this
library in other projects.

I do not believe I need to update travis due to this change, as the
evil Makefile continues to do in-tree builds. I expect I'll find
out soon enough.
 2016-05-11 01:43:42 +01:00
Chris Kitching af76508fe7
Introduce structure to the test/ directory 
This introduces a clear separation between test data and test
binaries. Test data is moved into test/data, and the test binaries
move into test/src. A new CMake script specific to building the
tests is introduced in /test to slightly clean up the toplevel
one.

As well as tidying things up, this makes the next step trivial...
 2016-05-11 01:30:08 +01:00
Chris Kitching bf7b6d15c7
Unset execute bit on sample.json 2016-05-11 01:10:29 +01:00
Niels 9ecf83f630 working on #235 2016-05-08 20:28:20 +02:00
Niels fadf286653 added test case for std::bad_alloc 2016-05-08 14:35:32 +02:00
Niels 85a30813c8 removed unnecessary code (numbers must not begin with "+") 2016-05-07 20:22:58 +02:00
Niels c04275966f improved test coverage 2016-05-07 18:33:43 +02:00
Niels f4ecceab19 cleanup 2016-04-30 00:12:19 +02:00
Niels 1d3b4dd158 added test cases 2016-04-30 00:03:47 +02:00
Niels 5e0bf75d60 cleanup, test, and diff 2016-04-25 23:17:04 +02:00