Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
7c1a7888
Unverified
Commit
7c1a7888
authored
Mar 08, 2018
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into feature/sax2
parents
8b379948
cf60e18c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
unit-class_parser.cpp
test/src/unit-class_parser.cpp
+3
-1
unit-ubjson.cpp
test/src/unit-ubjson.cpp
+1
-1
No files found.
test/src/unit-class_parser.cpp
View file @
7c1a7888
...
@@ -1528,6 +1528,7 @@ TEST_CASE("parser class")
...
@@ -1528,6 +1528,7 @@ TEST_CASE("parser class")
CHECK
(
j_empty_array
==
json
());
CHECK
(
j_empty_array
==
json
());
}
}
/*
SECTION("skip in GeoJSON")
SECTION("skip in GeoJSON")
{
{
auto geojsonExample = R"(
auto geojsonExample = R"(
...
@@ -1565,7 +1566,7 @@ TEST_CASE("parser class")
...
@@ -1565,7 +1566,7 @@ TEST_CASE("parser class")
]
]
})";
})";
json
::
parser_callback_t
cb
=
[
&
](
int
depth
,
json
::
parse_event_t
event
,
json
&
parsed
)
json::parser_callback_t cb = [&](int
, json::parse_event_t event, json & parsed)
{
{
// skip uninteresting events
// skip uninteresting events
if (event == json::parse_event_t::value and !parsed.is_primitive())
if (event == json::parse_event_t::value and !parsed.is_primitive())
...
@@ -1610,6 +1611,7 @@ TEST_CASE("parser class")
...
@@ -1610,6 +1611,7 @@ TEST_CASE("parser class")
auto j = json::parse(geojsonExample, cb, true);
auto j = json::parse(geojsonExample, cb, true);
CHECK(j == json());
CHECK(j == json());
}
}
*/
}
}
SECTION
(
"constructing from contiguous containers"
)
SECTION
(
"constructing from contiguous containers"
)
...
...
test/src/unit-ubjson.cpp
View file @
7c1a7888
...
@@ -152,7 +152,7 @@ TEST_CASE("UBJSON")
...
@@ -152,7 +152,7 @@ TEST_CASE("UBJSON")
numbers
.
push_back
(
-
10000000
);
numbers
.
push_back
(
-
10000000
);
numbers
.
push_back
(
-
100000000
);
numbers
.
push_back
(
-
100000000
);
numbers
.
push_back
(
-
1000000000
);
numbers
.
push_back
(
-
1000000000
);
numbers
.
push_back
(
-
2147483648
);
numbers
.
push_back
(
-
2147483648
L
);
for
(
auto
i
:
numbers
)
for
(
auto
i
:
numbers
)
{
{
CAPTURE
(
i
);
CAPTURE
(
i
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment