j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

💚 fix build

Browse source
This commit is contained in:
Niels Lohmann 2020-05-19 13:45:52 +02:00
parent 21b1680ea1
commit 4d39644bd0
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/macos.yml vendored
View file

@ -14,4 +14,4 @@ jobs:
- name: build - name: build
run: cmake --build build --parallel 10 run: cmake --build build --parallel 10
- name: test - name: test
run: cd build ; ctest -j 10 run: cd build ; ctest -j 10 --output-on-failure

2
.github/workflows/ubuntu.yml vendored
View file

@ -14,4 +14,4 @@ jobs:
- name: build - name: build
run: cmake --build build --parallel 10 run: cmake --build build --parallel 10
- name: test - name: test
run: cd build ; ctest -j 10 run: cd build ; ctest -j 10 --output-on-failure

2
.github/workflows/windows.yml vendored
View file

@ -14,4 +14,4 @@ jobs:
- name: build - name: build
run: cmake --build build --parallel 10 run: cmake --build build --parallel 10
- name: test - name: test
run: cd build ; ctest -j 10 -C Debug --exclude-regex "test-unicode" run: cd build ; ctest -j 10 -C Debug --exclude-regex "test-unicode" --output-on-failure

2
test/src/unit-bson.cpp
View file

@ -499,7 +499,7 @@ TEST_CASE("BSON")
const auto s = std::vector<std::uint8_t>(N, 'x'); const auto s = std::vector<std::uint8_t>(N, 'x');
json j = json j =
{ {
{ "entry", json::binary(s) } { "entry", json::binary(s, 0) }
}; };
std::vector<std::uint8_t> expected = std::vector<std::uint8_t> expected =

7
test/src/unit-udt.cpp
View file

@ -765,9 +765,12 @@ TEST_CASE("different basic_json types conversions")
SECTION("binary") SECTION("binary")
{ {
json j = json::binary({1, 2, 3}); json j = json::binary({1, 2, 3}, 42);
custom_json cj = j; custom_json cj = j;
CHECK(cj.get_binary() == j.get_binary()); CHECK(cj.get_binary().subtype() == 42);
std::vector<std::uint8_t> cv = cj.get_binary();
std::vector<std::uint8_t> v = j.get_binary();
CHECK(cv == v);
} }
SECTION("object") SECTION("object")