diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index cf9f5f45..f57ddf71 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -6,6 +6,7 @@ add_executable(${JSON_UNITTEST_TARGET_NAME}
"src/unit-algorithms.cpp"
"src/unit-allocator.cpp"
"src/unit-capacity.cpp"
+ "src/unit-cbor.cpp"
"src/unit-class_const_iterator.cpp"
"src/unit-class_iterator.cpp"
"src/unit-class_lexer.cpp"
diff --git a/test/Makefile b/test/Makefile
index 0f695a53..a12760fb 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -10,6 +10,7 @@ SOURCES = src/unit.cpp \
src/unit-algorithms.cpp \
src/unit-allocator.cpp \
src/unit-capacity.cpp \
+ src/unit-cbor.cpp \
src/unit-class_const_iterator.cpp \
src/unit-class_iterator.cpp \
src/unit-class_lexer.cpp \
diff --git a/test/data/json_testsuite/sample.json.cbor b/test/data/json_testsuite/sample.json.cbor
new file mode 100644
index 00000000..3f1d8ddf
Binary files /dev/null and b/test/data/json_testsuite/sample.json.cbor differ
diff --git a/test/src/unit-cbor.cpp b/test/src/unit-cbor.cpp
new file mode 100644
index 00000000..7f797df4
--- /dev/null
+++ b/test/src/unit-cbor.cpp
@@ -0,0 +1,628 @@
+/*
+ __ _____ _____ _____
+ __| | __| | | | JSON for Modern C++ (test suite)
+| | |__ | | | | | | version 2.0.7
+|_____|_____|_____|_|___| https://github.com/nlohmann/json
+
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+Copyright (c) 2013-2016 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include "catch.hpp"
+
+#include "json.hpp"
+using nlohmann::json;
+
+#include <fstream>
+
+TEST_CASE("CBOR")
+{
+ SECTION("individual values")
+ {
+ SECTION("null")
+ {
+ json j = nullptr;
+ std::vector<uint8_t> expected = {0xf6};
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+
+ SECTION("boolean")
+ {
+ SECTION("true")
+ {
+ json j = true;
+ std::vector<uint8_t> expected = {0xf5};
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+
+ SECTION("false")
+ {
+ json j = false;
+ std::vector<uint8_t> expected = {0xf4};
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+ }
+
+ SECTION("number")
+ {
+ SECTION("signed")
+ {
+ SECTION("-24..-1")
+ {
+ for (auto i = -24; i <= -1; ++i)
+ {
+ CAPTURE(i);
+
+ // create JSON value with integer number
+ json j = i;
+
+ // check type
+ CHECK(j.is_number_integer());
+
+ // create expected byte vector
+ std::vector<uint8_t> expected;
+ expected.push_back(0x20 - 1 - static_cast<uint8_t>(i));
+
+ // compare result + size
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+ CHECK(result.size() == 1);
+
+ // check individual bytes
+ CHECK(static_cast<int8_t>(0x20 - 1 - result[0]) == i);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+ }
+
+ /*
+ SECTION("0..127 (positive fixnum)")
+ {
+ for (size_t i = 0; i <= 255; ++i)
+ {
+ CAPTURE(i);
+
+ // create JSON value with integer number
+ json j = -1;
+ j.get_ref<json::number_integer_t&>() = static_cast<json::number_integer_t>(i);
+
+ // check type
+ CHECK(j.is_number_integer());
+
+ // create expected byte vector
+ std::vector<uint8_t> expected;
+ expected.push_back(static_cast<uint8_t>(i));
+
+ // compare result + size
+ const auto result = json::to_msgpack(j);
+ CHECK(result == expected);
+ CHECK(result.size() == 1);
+
+ // check individual bytes
+ CHECK(result[0] == i);
+
+ // roundtrip
+ CHECK(json::from_msgpack(result) == j);
+ }
+ }
+ */
+
+ SECTION("-256..-24")
+ {
+ for (auto i = -256; i < -24; ++i)
+ {
+ CAPTURE(i);
+
+ // create JSON value with integer number
+ json j = i;
+
+ // check type
+ CHECK(j.is_number_integer());
+
+ // create expected byte vector
+ std::vector<uint8_t> expected;
+ expected.push_back(0x38);
+ expected.push_back(static_cast<uint8_t>(-1 - i));
+
+ // compare result + size
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+ CHECK(result.size() == 2);
+
+ // check individual bytes
+ CHECK(result[0] == 0x38);
+ CHECK(static_cast<int16_t>(-1 - result[1]) == i);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+ }
+
+ SECTION("-9263 (int 16)")
+ {
+ json j = -9263;
+ std::vector<uint8_t> expected = {0x39, 0x24, 0x2e};
+
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ int16_t restored = -1 - ((result[1] << 8) + result[2]);
+ CHECK(restored == -9263);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+
+ /*
+ SECTION("-32768..-129 (int 16)")
+ {
+ for (int16_t i = -32768; i <= -129; ++i)
+ {
+ CAPTURE(i);
+
+ // create JSON value with integer number
+ json j = i;
+
+ // check type
+ CHECK(j.is_number_integer());
+
+ // create expected byte vector
+ std::vector<uint8_t> expected;
+ expected.push_back(0xd1);
+ expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
+ expected.push_back(static_cast<uint8_t>(i & 0xff));
+
+ // compare result + size
+ const auto result = json::to_msgpack(j);
+ CHECK(result == expected);
+ CHECK(result.size() == 3);
+
+ // check individual bytes
+ CHECK(result[0] == 0xd1);
+ int16_t restored = (result[1] << 8) + result[2];
+ CHECK(restored == i);
+
+ // roundtrip
+ CHECK(json::from_msgpack(result) == j);
+ }
+ }
+ */
+ }
+
+ SECTION("unsigned")
+ {
+ SECTION("0..127 (positive fixnum)")
+ {
+ for (size_t i = 0; i <= 127; ++i)
+ {
+ CAPTURE(i);
+
+ // create JSON value with unsigned integer number
+ json j = i;
+
+ // check type
+ CHECK(j.is_number_unsigned());
+
+ // create expected byte vector
+ std::vector<uint8_t> expected;
+ expected.push_back(static_cast<uint8_t>(i));
+
+ // compare result + size
+ const auto result = json::to_msgpack(j);
+ CHECK(result == expected);
+ CHECK(result.size() == 1);
+
+ // check individual bytes
+ CHECK(result[0] == i);
+
+ // roundtrip
+ CHECK(json::from_msgpack(result) == j);
+ }
+ }
+
+ SECTION("128..255 (uint 8)")
+ {
+ for (size_t i = 128; i <= 255; ++i)
+ {
+ CAPTURE(i);
+
+ // create JSON value with unsigned integer number
+ json j = i;
+
+ // check type
+ CHECK(j.is_number_unsigned());
+
+ // create expected byte vector
+ std::vector<uint8_t> expected;
+ expected.push_back(0xcc);
+ expected.push_back(static_cast<uint8_t>(i));
+
+ // compare result + size
+ const auto result = json::to_msgpack(j);
+ CHECK(result == expected);
+ CHECK(result.size() == 2);
+
+ // check individual bytes
+ CHECK(result[0] == 0xcc);
+ uint8_t restored = static_cast<uint8_t>(result[1]);
+ CHECK(restored == i);
+
+ // roundtrip
+ CHECK(json::from_msgpack(result) == j);
+ }
+ }
+
+ SECTION("256..65535 (uint 16)")
+ {
+ for (size_t i = 256; i <= 65535; ++i)
+ {
+ CAPTURE(i);
+
+ // create JSON value with unsigned integer number
+ json j = i;
+
+ // check type
+ CHECK(j.is_number_unsigned());
+
+ // create expected byte vector
+ std::vector<uint8_t> expected;
+ expected.push_back(0xcd);
+ expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
+ expected.push_back(static_cast<uint8_t>(i & 0xff));
+
+ // compare result + size
+ const auto result = json::to_msgpack(j);
+ CHECK(result == expected);
+ CHECK(result.size() == 3);
+
+ // check individual bytes
+ CHECK(result[0] == 0xcd);
+ uint16_t restored = static_cast<uint8_t>(result[1]) * 256 + static_cast<uint8_t>(result[2]);
+ CHECK(restored == i);
+
+ // roundtrip
+ CHECK(json::from_msgpack(result) == j);
+ }
+ }
+
+ SECTION("65536..4294967295 (uint 32)")
+ {
+ for (uint32_t i :
+ {
+ 65536u, 77777u, 1048576u
+ })
+ {
+ CAPTURE(i);
+
+ // create JSON value with unsigned integer number
+ json j = i;
+
+ // check type
+ CHECK(j.is_number_unsigned());
+
+ // create expected byte vector
+ std::vector<uint8_t> expected;
+ expected.push_back(0xce);
+ expected.push_back(static_cast<uint8_t>((i >> 24) & 0xff));
+ expected.push_back(static_cast<uint8_t>((i >> 16) & 0xff));
+ expected.push_back(static_cast<uint8_t>((i >> 8) & 0xff));
+ expected.push_back(static_cast<uint8_t>(i & 0xff));
+
+ // compare result + size
+ const auto result = json::to_msgpack(j);
+ CHECK(result == expected);
+ CHECK(result.size() == 5);
+
+ // check individual bytes
+ CHECK(result[0] == 0xce);
+ uint32_t restored = static_cast<uint32_t>((static_cast<uint32_t>(result[1]) << 030) +
+ (static_cast<uint32_t>(result[2]) << 020) +
+ (static_cast<uint32_t>(result[3]) << 010) +
+ static_cast<uint32_t>(result[4]));
+ CHECK(restored == i);
+
+ // roundtrip
+ CHECK(json::from_msgpack(result) == j);
+ }
+ }
+ }
+
+ SECTION("float")
+ {
+ SECTION("3.1415925")
+ {
+ double v = 3.1415925;
+ json j = v;
+ std::vector<uint8_t> expected =
+ {
+ 0xfb, 0x40, 0x09, 0x21, 0xfb, 0x3f, 0xa6, 0xde, 0xfc
+ };
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ // restore value (reverse array for endianess)
+ double restored;
+ std::reverse(expected.begin(), expected.end());
+ memcpy(&restored, expected.data(), sizeof(double));
+ CHECK(restored == v);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+ }
+ }
+
+ SECTION("string")
+ {
+ SECTION("N = 0..23")
+ {
+ for (size_t N = 0; N <= 0x17; ++N)
+ {
+ CAPTURE(N);
+
+ // create JSON value with string containing of N * 'x'
+ const auto s = std::string(N, 'x');
+ json j = s;
+
+ // create expected byte vector
+ std::vector<uint8_t> expected;
+ expected.push_back(static_cast<uint8_t>(0x60 + N));
+ for (size_t i = 0; i < N; ++i)
+ {
+ expected.push_back('x');
+ }
+
+ // compare result + size
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+ CHECK(result.size() == N + 1);
+ // check that no null byte is appended
+ if (N > 0)
+ {
+ CHECK(result.back() != '\x00');
+ }
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+ }
+
+ SECTION("N = 24..255")
+ {
+ for (size_t N = 24; N <= 255; ++N)
+ {
+ CAPTURE(N);
+
+ // create JSON value with string containing of N * 'x'
+ const auto s = std::string(N, 'x');
+ json j = s;
+
+ // create expected byte vector
+ std::vector<uint8_t> expected;
+ expected.push_back(0x78);
+ expected.push_back(static_cast<uint8_t>(N));
+ for (size_t i = 0; i < N; ++i)
+ {
+ expected.push_back('x');
+ }
+
+ // compare result + size
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+ CHECK(result.size() == N + 2);
+ // check that no null byte is appended
+ CHECK(result.back() != '\x00');
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+ }
+
+ SECTION("N = 256..65535")
+ {
+ for (size_t N :
+ {
+ 256u, 999u, 1025u, 3333u, 2048u, 65535u
+ })
+ {
+ CAPTURE(N);
+
+ // create JSON value with string containing of N * 'x'
+ const auto s = std::string(N, 'x');
+ json j = s;
+
+ // create expected byte vector (hack: create string first)
+ std::vector<uint8_t> expected(N, 'x');
+ // reverse order of commands, because we insert at begin()
+ expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+ expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+ expected.insert(expected.begin(), 0x79);
+
+ // compare result + size
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+ CHECK(result.size() == N + 3);
+ // check that no null byte is appended
+ CHECK(result.back() != '\x00');
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+ }
+
+ SECTION("N = 65536..4294967295")
+ {
+ for (size_t N :
+ {
+ 65536u, 77777u, 1048576u
+ })
+ {
+ CAPTURE(N);
+
+ // create JSON value with string containing of N * 'x'
+ const auto s = std::string(N, 'x');
+ json j = s;
+
+ // create expected byte vector (hack: create string first)
+ std::vector<uint8_t> expected(N, 'x');
+ // reverse order of commands, because we insert at begin()
+ expected.insert(expected.begin(), static_cast<uint8_t>(N & 0xff));
+ expected.insert(expected.begin(), static_cast<uint8_t>((N >> 8) & 0xff));
+ expected.insert(expected.begin(), static_cast<uint8_t>((N >> 16) & 0xff));
+ expected.insert(expected.begin(), static_cast<uint8_t>((N >> 24) & 0xff));
+ expected.insert(expected.begin(), 0x7a);
+
+ // compare result + size
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+ CHECK(result.size() == N + 5);
+ // check that no null byte is appended
+ CHECK(result.back() != '\x00');
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+ }
+ }
+
+ SECTION("array")
+ {
+ SECTION("empty")
+ {
+ json j = json::array();
+ std::vector<uint8_t> expected = {0x80};
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+
+ SECTION("[null]")
+ {
+ json j = {nullptr};
+ std::vector<uint8_t> expected = {0x81, 0xf6};
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+
+ SECTION("[1,2,3,4,5]")
+ {
+ json j = json::parse("[1,2,3,4,5]");
+ std::vector<uint8_t> expected = {0x85, 0x01, 0x02, 0x03, 0x04, 0x05};
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+
+ SECTION("[[[[]]]]")
+ {
+ json j = json::parse("[[[[]]]]");
+ std::vector<uint8_t> expected = {0x81, 0x81, 0x81, 0x80};
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+ }
+
+ SECTION("object")
+ {
+ SECTION("empty")
+ {
+ json j = json::object();
+ std::vector<uint8_t> expected = {0xa0};
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+
+ SECTION("{\"\":null}")
+ {
+ json j = {{"", nullptr}};
+ std::vector<uint8_t> expected = {0xa1, 0x60, 0xf6};
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+
+ SECTION("{\"a\": {\"b\": {\"c\": {}}}}")
+ {
+ json j = json::parse("{\"a\": {\"b\": {\"c\": {}}}}");
+ std::vector<uint8_t> expected =
+ {
+ 0xa1, 0x61, 0x61, 0xa1, 0x61, 0x62, 0xa1, 0x61, 0x63, 0xa0
+ };
+ const auto result = json::to_cbor(j);
+ CHECK(result == expected);
+
+ // roundtrip
+ CHECK(json::from_cbor(result) == j);
+ }
+ }
+ }
+}
+
+// use this testcase outside [hide] to run it with Valgrind
+TEST_CASE("single CBOR roundtrip")
+{
+ SECTION("sample.json")
+ {
+ std::string filename = "test/data/json_testsuite/sample.json";
+
+ // parse JSON file
+ std::ifstream f_json(filename);
+ json j1 = json::parse(f_json);
+
+ // parse MessagePack file
+ std::ifstream f_cbor(filename + ".cbor", std::ios::binary);
+ std::vector<uint8_t> packed((std::istreambuf_iterator<char>(f_cbor)),
+ std::istreambuf_iterator<char>());
+ json j2;
+ CHECK_NOTHROW(j2 = json::from_cbor(packed));
+
+ // compare parsed JSON values
+ CHECK(j1 == j2);
+ }
+}