Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/alterschema/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ sourcemeta_library(NAMESPACE sourcemeta PROJECT blaze NAME alterschema
linter/enum_to_const.h
linter/equal_numeric_bounds_to_const.h
linter/forbid_empty_enum.h
linter/incoherent_exclusive_limits.h
linter/incoherent_min_max_contains.h
linter/invalid_external_ref.h
linter/items_array_default.h
Expand Down
2 changes: 2 additions & 0 deletions src/alterschema/alterschema.cc
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ auto WALK_UP_IN_PLACE_APPLICATORS(const JSON &root, const SchemaFrame &frame,
#include "linter/enum_to_const.h"
#include "linter/equal_numeric_bounds_to_const.h"
#include "linter/forbid_empty_enum.h"
#include "linter/incoherent_exclusive_limits.h"
#include "linter/incoherent_min_max_contains.h"
#include "linter/invalid_external_ref.h"
#include "linter/items_array_default.h"
Expand Down Expand Up @@ -464,6 +465,7 @@ auto add(SchemaTransformer &bundle, const AlterSchemaMode mode) -> void {
bundle.add<UnevaluatedItemsDefault>();
bundle.add<UnevaluatedPropertiesDefault>();
bundle.add<UnsatisfiableMaxContains>();
bundle.add<IncoherentExclusiveLimits>();
bundle.add<IncoherentMinMaxContains>();
bundle.add<UnsatisfiableMinProperties>();
bundle.add<EnumToConst>();
Expand Down
35 changes: 35 additions & 0 deletions src/alterschema/linter/incoherent_exclusive_limits.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
class IncoherentExclusiveLimits final : public SchemaTransformRule {
public:
using mutates = std::false_type;
using reframe_after_transform = std::false_type;
IncoherentExclusiveLimits()
: SchemaTransformRule{
"incoherent_exclusive_limits",
"`exclusiveMinimum` greater than or equal to `exclusiveMaximum` "
"makes the schema unsatisfiable"} {};

[[nodiscard]] auto
condition(const sourcemeta::core::JSON &schema,
const sourcemeta::core::JSON &,
const sourcemeta::core::Vocabularies &vocabularies,
const sourcemeta::core::SchemaFrame &,
const sourcemeta::core::SchemaFrame::Location &,
const sourcemeta::core::SchemaWalker &,
const sourcemeta::core::SchemaResolver &) const
-> SchemaTransformRule::Result override {
ONLY_CONTINUE_IF(vocabularies.contains_any(
{Vocabularies::Known::JSON_Schema_2020_12_Validation,
Comment thread
AcEKaycgR marked this conversation as resolved.
Vocabularies::Known::JSON_Schema_2019_09_Validation,
Vocabularies::Known::JSON_Schema_Draft_7,
Vocabularies::Known::JSON_Schema_Draft_6}) &&
schema.is_object());

const auto *exclusive_minimum{schema.try_at("exclusiveMinimum")};
ONLY_CONTINUE_IF(exclusive_minimum && exclusive_minimum->is_number());
const auto *exclusive_maximum{schema.try_at("exclusiveMaximum")};
ONLY_CONTINUE_IF(exclusive_maximum && exclusive_maximum->is_number() &&
*exclusive_minimum >= *exclusive_maximum);
Comment thread
AcEKaycgR marked this conversation as resolved.

return APPLIES_TO_KEYWORDS("exclusiveMinimum", "exclusiveMaximum");
}
};
86 changes: 86 additions & 0 deletions test/alterschema/alterschema_lint_2019_09_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2417,6 +2417,92 @@ TEST(AlterSchema_lint_2019_09, incoherent_min_max_contains_9) {
true);
}

TEST(AlterSchema_lint_2019_09, incoherent_exclusive_limits_1) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 1,
"exclusiveMaximum": 5
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_TRUE(result.first);
EXPECT_EQ(traces.size(), 0);
}

TEST(AlterSchema_lint_2019_09, incoherent_exclusive_limits_2) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 1
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_TRUE(result.first);
EXPECT_EQ(traces.size(), 0);
}

TEST(AlterSchema_lint_2019_09, incoherent_exclusive_limits_3) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 3,
Comment thread
AcEKaycgR marked this conversation as resolved.
"exclusiveMaximum": 3
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_FALSE(result.first);
EXPECT_EQ(traces.size(), 1);
EXPECT_LINT_TRACE(traces, 0, "", "incoherent_exclusive_limits",
"`exclusiveMinimum` greater than or equal to "
"`exclusiveMaximum` makes the schema unsatisfiable",
false);
}

TEST(AlterSchema_lint_2019_09, incoherent_exclusive_limits_4) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 5,
"exclusiveMaximum": 2
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_FALSE(result.first);
EXPECT_EQ(traces.size(), 1);
EXPECT_LINT_TRACE(traces, 0, "", "incoherent_exclusive_limits",
"`exclusiveMinimum` greater than or equal to "
"`exclusiveMaximum` makes the schema unsatisfiable",
false);
}

TEST(AlterSchema_lint_2019_09, incoherent_exclusive_limits_5) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMaximum": 5
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_TRUE(result.first);
EXPECT_EQ(traces.size(), 0);
}

TEST(AlterSchema_lint_2019_09, equal_numeric_bounds_to_const_1) {
sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2019-09/schema",
Expand Down
86 changes: 86 additions & 0 deletions test/alterschema/alterschema_lint_2020_12_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2324,6 +2324,92 @@ TEST(AlterSchema_lint_2020_12, incoherent_min_max_contains_9) {
true);
}

TEST(AlterSchema_lint_2020_12, incoherent_exclusive_limits_1) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 1,
"exclusiveMaximum": 5
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_TRUE(result.first);
EXPECT_EQ(traces.size(), 0);
}

TEST(AlterSchema_lint_2020_12, incoherent_exclusive_limits_2) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 1
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_TRUE(result.first);
EXPECT_EQ(traces.size(), 0);
}

TEST(AlterSchema_lint_2020_12, incoherent_exclusive_limits_3) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 3,
"exclusiveMaximum": 3
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_FALSE(result.first);
EXPECT_EQ(traces.size(), 1);
EXPECT_LINT_TRACE(traces, 0, "", "incoherent_exclusive_limits",
"`exclusiveMinimum` greater than or equal to "
"`exclusiveMaximum` makes the schema unsatisfiable",
false);
}

TEST(AlterSchema_lint_2020_12, incoherent_exclusive_limits_4) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 5,
"exclusiveMaximum": 2
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_FALSE(result.first);
EXPECT_EQ(traces.size(), 1);
EXPECT_LINT_TRACE(traces, 0, "", "incoherent_exclusive_limits",
"`exclusiveMinimum` greater than or equal to "
"`exclusiveMaximum` makes the schema unsatisfiable",
false);
}

TEST(AlterSchema_lint_2020_12, incoherent_exclusive_limits_5) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMaximum": 5
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_TRUE(result.first);
EXPECT_EQ(traces.size(), 0);
}

TEST(AlterSchema_lint_2020_12, equal_numeric_bounds_to_const_1) {
sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "https://json-schema.org/draft/2020-12/schema",
Expand Down
86 changes: 86 additions & 0 deletions test/alterschema/alterschema_lint_draft6_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1291,6 +1291,92 @@ TEST(AlterSchema_lint_draft6, exclusive_minimum_integer_to_minimum_4) {
EXPECT_EQ(document, expected);
}

TEST(AlterSchema_lint_draft6, incoherent_exclusive_limits_1) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 1,
"exclusiveMaximum": 5
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_TRUE(result.first);
EXPECT_EQ(traces.size(), 0);
}

TEST(AlterSchema_lint_draft6, incoherent_exclusive_limits_2) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 1
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_TRUE(result.first);
EXPECT_EQ(traces.size(), 0);
}

TEST(AlterSchema_lint_draft6, incoherent_exclusive_limits_3) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 3,
"exclusiveMaximum": 3
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_FALSE(result.first);
EXPECT_EQ(traces.size(), 1);
EXPECT_LINT_TRACE(traces, 0, "", "incoherent_exclusive_limits",
"`exclusiveMinimum` greater than or equal to "
"`exclusiveMaximum` makes the schema unsatisfiable",
false);
}

TEST(AlterSchema_lint_draft6, incoherent_exclusive_limits_4) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMinimum": 5,
"exclusiveMaximum": 2
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_FALSE(result.first);
EXPECT_EQ(traces.size(), 1);
EXPECT_LINT_TRACE(traces, 0, "", "incoherent_exclusive_limits",
"`exclusiveMinimum` greater than or equal to "
"`exclusiveMaximum` makes the schema unsatisfiable",
false);
}

TEST(AlterSchema_lint_draft6, incoherent_exclusive_limits_5) {
const sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
"title": "Test",
"description": "A test schema",
"examples": [ "foo" ],
"exclusiveMaximum": 5
})JSON");

LINT_WITHOUT_FIX(document, result, traces);

EXPECT_TRUE(result.first);
EXPECT_EQ(traces.size(), 0);
}

TEST(AlterSchema_lint_draft6, equal_numeric_bounds_to_const_1) {
sourcemeta::core::JSON document = sourcemeta::core::parse_json(R"JSON({
"$schema": "http://json-schema.org/draft-06/schema#",
Expand Down
Loading
Loading