Skip to content

Temp pin of test suite version #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 4, 2019
Merged

Temp pin of test suite version #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
926bfd4
clang-format
KayEss Jul 4, 2019
1c64ba5
Temporarily lock to and older version of the test suite.
KayEss Jul 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/assertions.numeric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ namespace {
return p(bound.value(), v)
? f5::json::validation::result{std::move(an)}
: f5::json::validation::result{
rule, an.spos, an.dpos};
rule, an.spos, an.dpos};
},
[&](double v) mutable {
return p(bound.value(), v)
? f5::json::validation::result{std::move(an)}
: f5::json::validation::result{
rule, an.spos, an.dpos};
rule, an.spos, an.dpos};
},
[&](const auto &) mutable {
return f5::json::validation::result{std::move(an)};
Expand All @@ -46,7 +46,7 @@ namespace {
return p(bound.value(), v)
? f5::json::validation::result{std::move(an)}
: f5::json::validation::result{
rule, an.spos, an.dpos};
rule, an.spos, an.dpos};
},
[&](double v) mutable {
bool passed;
Expand All @@ -58,7 +58,7 @@ namespace {
return passed
? f5::json::validation::result{std::move(an)}
: f5::json::validation::result{
rule, an.spos, an.dpos};
rule, an.spos, an.dpos};
},
[&](const auto &) mutable {
return f5::json::validation::result{std::move(an)};
Expand Down
12 changes: 8 additions & 4 deletions src/schema.loaders.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
Copyright 2018-2019, Proteus Technologies Co Ltd. <https://support.felspar.com/>
Copyright 2018-2019, Proteus Technologies Co Ltd.
<https://support.felspar.com/>

Distributed under the Boost Software License, Version 1.0.
See <http://www.boost.org/LICENSE_1_0.txt>
Expand All @@ -23,7 +24,8 @@ const fostlib::setting<f5::json::value> f5::json::c_schema_loaders(

namespace {
const fostlib::module c_fost_json_schema{fostlib::c_fost, "json-schema"};
const fostlib::module c_fost_json_schema_loader{c_fost_json_schema, "loader"};
const fostlib::module c_fost_json_schema_loader{c_fost_json_schema,
"loader"};
}


Expand Down Expand Up @@ -96,7 +98,8 @@ namespace {
config["base"])};
fostlib::url fetch{
base, url.substr(prefix.code_points())};
logger("base", base)("fetching", fetch)("found", true);
logger("base",
base)("fetching", fetch)("found", true);
try {
return http(base, fetch);
} catch (fostlib::exceptions::exception &e) {
Expand All @@ -116,7 +119,8 @@ namespace {
}
} else {
logger("found", false);
logger("reason", "URL doesn't start with supplied prefix");
logger("reason",
"URL doesn't start with supplied prefix");
}
} else {
logger("found", false);
Expand Down
19 changes: 11 additions & 8 deletions test/testsuite-v7/testsuite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,17 @@ namespace {
const fostlib::setting<bool> c_verbose(
__FILE__, "json-schema-testsuite", "Verbose", false, true);

const fostlib::setting<fostlib::string>
c_base(__FILE__,
"json-schema-testsuite",
"Base URL",
"https://github.com/raw/"
"json-schema-org/JSON-Schema-Test-Suite/"
"master/tests/draft7/",
true);
const fostlib::setting<fostlib::string> c_base(
__FILE__,
"json-schema-testsuite",
"Base URL",
"https://github.com/raw/json-schema-org/"
"JSON-Schema-Test-Suite/e64ebf90a001f4e0e18984d2086ea15765cfead2/"
"tests/draft7/",
//"https://github.com/raw/"
//"json-schema-org/JSON-Schema-Test-Suite/"
//"master/tests/draft7/",
true);

const fostlib::setting<fostlib::json> c_loaders{
__FILE__, f5::json::c_schema_loaders, []() {
Expand Down