Skip to content

Fix SimpleOutput annotation cleanup for failing contains items #602

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

Open
staging-devin-ai-integration wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix SimpleOutput annotation cleanup for failing contains items #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 28 additions & 5 deletions src/compiler/compile_output_simple.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,19 @@ auto SimpleOutput::operator()(
return;
}

const auto masked_failure{
!result && std::any_of(this->mask.cbegin(), this->mask.cend(),
[&evaluate_path](const auto &entry) {
return evaluate_path.starts_with(entry.first) &&
!entry.second;
})};
const auto masked_failure_at_root{
masked_failure && std::any_of(this->mask.cbegin(), this->mask.cend(),
[&evaluate_path](const auto &entry) {
return evaluate_path == entry.first &&
!entry.second;
})};

if (type == EvaluationType::Pre) {
assert(result);
const auto &keyword{evaluate_path.back().to_property()};
Expand All @@ -79,11 +92,21 @@ auto SimpleOutput::operator()(
return;
}

if (std::any_of(this->mask.cbegin(), this->mask.cend(),
[&evaluate_path](const auto &entry) {
return evaluate_path.starts_with(entry.first) &&
!entry.second;
})) {
if (type == EvaluationType::Post && !this->annotations_.empty() &&
masked_failure && !masked_failure_at_root) {
for (auto iterator = this->annotations_.begin();
iterator != this->annotations_.end();) {
if (iterator->first.evaluate_path.size() >= evaluate_path.size() &&
iterator->first.evaluate_path.starts_with_initial(evaluate_path) &&
iterator->first.instance_location.starts_with(instance_location)) {
iterator = this->annotations_.erase(iterator);
} else {
iterator++;
}
}
}

if (masked_failure) {
return;
}

Expand Down
36 changes: 36 additions & 0 deletions test/compiler/compiler_output_simple_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,42 @@ TEST(Compiler_output_simple, annotations_success_9) {
0, sourcemeta::core::JSON{true});
}

TEST(Compiler_output_simple, annotations_success_10) {
const sourcemeta::core::JSON schema{sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"contains": {
"type": "number",
"title": "Test"
}
})JSON")};

const auto schema_template{sourcemeta::blaze::compile(
schema, sourcemeta::core::schema_official_walker,
sourcemeta::core::schema_official_resolver,
sourcemeta::blaze::default_schema_compiler,
sourcemeta::blaze::Mode::Exhaustive)};

const sourcemeta::core::JSON instance{
sourcemeta::core::parse_json("[ \"foo\", 42, true ]")};

sourcemeta::blaze::SimpleOutput output{instance};
sourcemeta::blaze::Evaluator evaluator;
const auto result{
evaluator.validate(schema_template, instance, std::ref(output))};
EXPECT_TRUE(result);

EXPECT_ANNOTATION_COUNT(output, 2);

EXPECT_ANNOTATION_ENTRY(output, "", "/contains", "#/contains", 1);
EXPECT_ANNOTATION_VALUE(output, "", "/contains", "#/contains", 0,
sourcemeta::core::JSON{1});

EXPECT_ANNOTATION_ENTRY(output, "/1", "/contains/title", "#/contains/title",
1);
EXPECT_ANNOTATION_VALUE(output, "/1", "/contains/title", "#/contains/title",
0, sourcemeta::core::JSON{"Test"});
}

TEST(Compiler_output_simple, annotations_failure_1) {
const sourcemeta::core::JSON schema{sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
Expand Down