Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
81 additions
and
79 deletions
+81
-79
test/src/unit-class_parser.cpp
test/src/unit-class_parser.cpp
+80
-78
test/src/unit-ubjson.cpp
test/src/unit-ubjson.cpp
+1
-1
No files found.
test/src/unit-class_parser.cpp
View file @
7c1a7888
...
...
@@ -1528,88 +1528,90 @@ TEST_CASE("parser class")
CHECK
(
j_empty_array
==
json
());
}
SECTION
(
"skip in GeoJSON"
)
{
auto
geojsonExample
=
R"(
{ "type": "FeatureCollection",
"features": [
{ "type": "Feature",
"geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
"properties": {"prop0": "value0"}
},
{ "type": "Feature",
"geometry": {
"type": "LineString",
"coordinates": [
[102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]
]
},
"properties": {
"prop0": "value0",
"prop1": 0.0
}
},
{ "type": "Feature",
"geometry": {
"type": "Polygon",
"coordinates": [
[ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0],
[100.0, 1.0], [100.0, 0.0] ]
]
},
"properties": {
"prop0": "value0",
"prop1": {"this": "that"}
}
}
]
})"
;
json
::
parser_callback_t
cb
=
[
&
](
int
depth
,
json
::
parse_event_t
event
,
json
&
parsed
)
{
// skip uninteresting events
if
(
event
==
json
::
parse_event_t
::
value
and
!
parsed
.
is_primitive
())
/*
SECTION("skip in GeoJSON")
{
return
false
;
}
switch
(
event
)
{
case
json
:
:
parse_event_t
::
key
:
{
return
true
;
}
case
json
:
:
parse_event_t
::
value
:
{
return
false
;
}
case
json
:
:
parse_event_t
::
object_start
:
{
return
true
;
}
case
json
:
:
parse_event_t
::
object_end
:
{
return
false
;
}
case
json
:
:
parse_event_t
::
array_start
:
auto geojsonExample = R"(
{ "type": "FeatureCollection",
"features": [
{ "type": "Feature",
"geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
"properties": {"prop0": "value0"}
},
{ "type": "Feature",
"geometry": {
"type": "LineString",
"coordinates": [
[102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]
]
},
"properties": {
"prop0": "value0",
"prop1": 0.0
}
},
{ "type": "Feature",
"geometry": {
"type": "Polygon",
"coordinates": [
[ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0],
[100.0, 1.0], [100.0, 0.0] ]
]
},
"properties": {
"prop0": "value0",
"prop1": {"this": "that"}
}
}
]
})";
json::parser_callback_t cb = [&](int, json::parse_event_t event, json & parsed)
{
return
true
;
}
case
json
:
:
parse_event_t
::
array_end
:
{
return
false
;
}
// skip uninteresting events
if (event == json::parse_event_t::value and !parsed.is_primitive())
{
return false;
}
default:
{
return
true
;
}
}
};
switch (event)
{
case json::parse_event_t::key:
{
return true;
}
case json::parse_event_t::value:
{
return false;
}
case json::parse_event_t::object_start:
{
return true;
}
case json::parse_event_t::object_end:
{
return false;
}
case json::parse_event_t::array_start:
{
return true;
}
case json::parse_event_t::array_end:
{
return false;
}
default:
{
return true;
}
}
};
auto
j
=
json
::
parse
(
geojsonExample
,
cb
,
true
);
CHECK
(
j
==
json
());
}
auto j = json::parse(geojsonExample, cb, true);
CHECK(j == json());
}
*/
}
SECTION
(
"constructing from contiguous containers"
)
...
...
test/src/unit-ubjson.cpp
View file @
7c1a7888
...
...
@@ -152,7 +152,7 @@ TEST_CASE("UBJSON")
numbers
.
push_back
(
-
10000000
);
numbers
.
push_back
(
-
100000000
);
numbers
.
push_back
(
-
1000000000
);
numbers
.
push_back
(
-
2147483648
);
numbers
.
push_back
(
-
2147483648
L
);
for
(
auto
i
:
numbers
)
{
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