Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
LEFEBVREJP email
radix
Commits
2587bc29
Commit
2587bc29
authored
Apr 06, 2020
by
LEFEBVREJP email
Browse files
Fixing fail04/09 pass tests. Cleaning up failure checks.
parent
6693ba85
Pipeline
#96305
passed with stages
in 20 minutes and 56 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
radixcore/tests/tstJson.cc
View file @
2587bc29
...
...
@@ -247,18 +247,9 @@ bool parse_and_test(const std::string& file)
}
bool
success
=
parser
.
parse_from_file
(
filename
);
if
(
benchmark
)
benchmark_timer
.
stop
();
bool
return_success
=
false
;
// check if failure is expected
if
(
file
.
substr
(
0
,
4
).
compare
(
"fail"
)
==
0
)
{
return_success
=
!
success
;
}
else
{
return_success
=
success
;
}
// only show error if parse failed and it was supposed to succeed
if
(
!
success
&&
!
return_success
)
if
(
!
success
)
{
// dump the json error
std
::
cout
<<
parser
.
last_error
()
<<
std
::
endl
;
...
...
@@ -269,49 +260,49 @@ bool parse_and_test(const std::string& file)
<<
") timing: "
<<
(
benchmark_timer
.
duration
()
/
1e9
)
<<
" seconds"
<<
std
::
endl
;
}
return
return_
success
;
return
success
;
}
TEST
(
JSONParser
,
JSONCheckerFailures
)
{
// EXPECT_TRUE(parse_and_test("fail01_EXCLUDE.json"));
EXPECT_
TRU
E
(
parse_and_test
(
"fail02.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail03.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail05.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail06.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail07.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail08.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail10.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail11.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail12.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail13.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail14.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail15.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail16.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail17.json"
));
// EXPECT_
TRU
E(parse_and_test("fail18_EXCLUDE.json"));
EXPECT_
TRU
E
(
parse_and_test
(
"fail19.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail20.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail21.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail22.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail23.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail24.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail25.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail26.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail27.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail28.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail29.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail30.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail31.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail32.json"
));
EXPECT_
TRU
E
(
parse_and_test
(
"fail33.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail02.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail03.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail05.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail06.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail07.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail08.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail10.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail11.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail12.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail13.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail14.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail15.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail16.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail17.json"
));
// EXPECT_
FALS
E(parse_and_test("fail18_EXCLUDE.json"));
EXPECT_
FALS
E
(
parse_and_test
(
"fail19.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail20.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail21.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail22.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail23.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail24.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail25.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail26.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail27.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail28.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail29.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail30.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail31.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail32.json"
));
EXPECT_
FALS
E
(
parse_and_test
(
"fail33.json"
));
}
TEST
(
JSONParser
,
JSONCheckerPassing
)
{
EXPECT_TRUE
(
parse_and_test
(
"pass01.json"
));
EXPECT_TRUE
(
parse_and_test
(
"pass02.json"
));
EXPECT_TRUE
(
parse_and_test
(
"pass03.json"
));
EXPECT_TRUE
(
parse_and_test
(
"
fail
04.json"
));
EXPECT_TRUE
(
parse_and_test
(
"
fail09
.json"
));
EXPECT_TRUE
(
parse_and_test
(
"
pass
04.json"
));
EXPECT_TRUE
(
parse_and_test
(
"
pass05
.json"
));
EXPECT_TRUE
(
parse_and_test
(
"roundtrip01.json"
));
EXPECT_TRUE
(
parse_and_test
(
"roundtrip02.json"
));
EXPECT_TRUE
(
parse_and_test
(
"roundtrip03.json"
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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