Skip to content

Reparent string constraints under PatternConstraint + test improvements #458

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
Seth Fitzsimmons (mojodna) wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Reparent string constraints under PatternConstraint + test improvements #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f9e7c2c
Reparent 8 string constraints under PatternConstraint
mojodna Mar 4, 2026
1cbe5a6
fix: StrippedConstraint JSON schema pattern accepts empty string
mojodna Mar 4, 2026
97ca9a5
Strengthen weak assertions in string constraint tests
mojodna Mar 4, 2026
2b8a8bd
Parametrize PatternConstraint subclass tests
mojodna Mar 4, 2026
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
14 changes: 7 additions & 7 deletions packages/overture-schema-addresses-theme/tests/address_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"value": {
"description": "String with no leading/trailing whitespace",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Value",
"type": "string"
}
Expand Down Expand Up @@ -45,7 +45,7 @@
},
"license": {
"description": "Source data license name.\n\nThis should be a valid SPDX license identifier when available.\n\nIf omitted, contact the data provider for more license information.",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "License",
"type": "string"
},
Expand Down Expand Up @@ -160,21 +160,21 @@
"number": {
"description": "The house number.\n\nThis field does not necessarily contain an integer or even a number. Values such as\n\"74B\", \"189 1/2\", and \"208.5\", where the non-integer or non-number part is part of\nthe house number, not a unit number, are in common use.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Number",
"type": "string"
},
"postal_city": {
"description": "The postal authority designated city name, if applicable.\n\nIn some countries or regions, a mailing address may need to specify a different city\nname than the city that actually contains the address coordinates. This optional\nfield can be used to specify the alternate city name to use.\n\nFor example:\n\n- The postal city for the US address *716 East County Road, Winchester, Indiana*\n is Ridgeville.\n- The postal city for the Slovenian address *Tomaj 71, 6221 Tomaj, Slovenia* is\n Dutovlje.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Postal City",
"type": "string"
},
"postcode": {
"description": "The postal code.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Postcode",
"type": "string"
},
Expand All @@ -191,7 +191,7 @@
"street": {
"description": "The street name.\n\nThe street name can include a type (*e.g.*, \"Street\" or \"St\", \"Boulevard\" or \"Blvd\",\n*etc.*) and a directional (*e.g.*, \"NW\" or \"Northwest\", \"S\" or \"Sud\"). Both type and\ndirectional, if present, may be either a prefix or a suffix to the primary name.\nThey may either be fully spelled-out or abbreviated.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Street",
"type": "string"
},
Expand All @@ -208,7 +208,7 @@
"unit": {
"description": "The secondary address unit designator.\n\nIn the case where the primary street address is divided into secondary units, which\nmay be apartments, floors, or even buildings if the primary street address is a\ncampus, this field names the specific secondary unit being addressed.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Unit",
"type": "string"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/overture-schema-base-theme/tests/bathymetry_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
},
"license": {
"description": "Source data license name.\n\nThis should be a valid SPDX license identifier when available.\n\nIf omitted, contact the data provider for more license information.",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "License",
"type": "string"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/overture-schema-base-theme/tests/infrastructure_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@
"value": {
"description": "The actual name value.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Value",
"type": "string"
},
Expand Down Expand Up @@ -265,7 +265,7 @@
"patternProperties": {
"^(?:(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}?)|(?:[A-Za-z]{4,8}))(?:-[A-Za-z]{4})?(?:-[A-Za-z]{2}|[0-9]{3})?(?:-(?:[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(?:-[A-WY-Za-wy-z0-9](?:-[A-Za-z0-9]{2,8})+)*$": {
"description": "String with no leading/trailing whitespace",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"type": "string"
}
},
Expand All @@ -278,7 +278,7 @@
"primary": {
"description": "The most commonly used name.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Primary",
"type": "string"
},
Expand Down Expand Up @@ -375,7 +375,7 @@
},
"license": {
"description": "Source data license name.\n\nThis should be a valid SPDX license identifier when available.\n\nIf omitted, contact the data provider for more license information.",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "License",
"type": "string"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/overture-schema-base-theme/tests/land_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
"value": {
"description": "The actual name value.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Value",
"type": "string"
},
Expand Down Expand Up @@ -138,7 +138,7 @@
"patternProperties": {
"^(?:(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}?)|(?:[A-Za-z]{4,8}))(?:-[A-Za-z]{4})?(?:-[A-Za-z]{2}|[0-9]{3})?(?:-(?:[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(?:-[A-WY-Za-wy-z0-9](?:-[A-Za-z0-9]{2,8})+)*$": {
"description": "String with no leading/trailing whitespace",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"type": "string"
}
},
Expand All @@ -151,7 +151,7 @@
"primary": {
"description": "The most commonly used name.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Primary",
"type": "string"
},
Expand Down Expand Up @@ -248,7 +248,7 @@
},
"license": {
"description": "Source data license name.\n\nThis should be a valid SPDX license identifier when available.\n\nIf omitted, contact the data provider for more license information.",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "License",
"type": "string"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/overture-schema-base-theme/tests/land_cover_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
},
"license": {
"description": "Source data license name.\n\nThis should be a valid SPDX license identifier when available.\n\nIf omitted, contact the data provider for more license information.",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "License",
"type": "string"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/overture-schema-base-theme/tests/land_use_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
"value": {
"description": "The actual name value.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Value",
"type": "string"
},
Expand Down Expand Up @@ -216,7 +216,7 @@
"patternProperties": {
"^(?:(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}?)|(?:[A-Za-z]{4,8}))(?:-[A-Za-z]{4})?(?:-[A-Za-z]{2}|[0-9]{3})?(?:-(?:[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(?:-[A-WY-Za-wy-z0-9](?:-[A-Za-z0-9]{2,8})+)*$": {
"description": "String with no leading/trailing whitespace",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"type": "string"
}
},
Expand All @@ -229,7 +229,7 @@
"primary": {
"description": "The most commonly used name.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Primary",
"type": "string"
},
Expand Down Expand Up @@ -326,7 +326,7 @@
},
"license": {
"description": "Source data license name.\n\nThis should be a valid SPDX license identifier when available.\n\nIf omitted, contact the data provider for more license information.",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "License",
"type": "string"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/overture-schema-base-theme/tests/water_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"value": {
"description": "The actual name value.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Value",
"type": "string"
},
Expand Down Expand Up @@ -69,7 +69,7 @@
"patternProperties": {
"^(?:(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}?)|(?:[A-Za-z]{4,8}))(?:-[A-Za-z]{4})?(?:-[A-Za-z]{2}|[0-9]{3})?(?:-(?:[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(?:-[A-WY-Za-wy-z0-9](?:-[A-Za-z0-9]{2,8})+)*$": {
"description": "String with no leading/trailing whitespace",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"type": "string"
}
},
Expand All @@ -82,7 +82,7 @@
"primary": {
"description": "The most commonly used name.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Primary",
"type": "string"
},
Expand Down Expand Up @@ -179,7 +179,7 @@
},
"license": {
"description": "Source data license name.\n\nThis should be a valid SPDX license identifier when available.\n\nIf omitted, contact the data provider for more license information.",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "License",
"type": "string"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/overture-schema-buildings-theme/tests/building_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@
"value": {
"description": "The actual name value.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Value",
"type": "string"
},
Expand Down Expand Up @@ -201,7 +201,7 @@
"patternProperties": {
"^(?:(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}?)|(?:[A-Za-z]{4,8}))(?:-[A-Za-z]{4})?(?:-[A-Za-z]{2}|[0-9]{3})?(?:-(?:[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(?:-[A-WY-Za-wy-z0-9](?:-[A-Za-z0-9]{2,8})+)*$": {
"description": "String with no leading/trailing whitespace",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"type": "string"
}
},
Expand All @@ -214,7 +214,7 @@
"primary": {
"description": "The most commonly used name.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Primary",
"type": "string"
},
Expand Down Expand Up @@ -362,7 +362,7 @@
},
"license": {
"description": "Source data license name.\n\nThis should be a valid SPDX license identifier when available.\n\nIf omitted, contact the data provider for more license information.",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "License",
"type": "string"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/overture-schema-buildings-theme/tests/building_part_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"value": {
"description": "The actual name value.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Value",
"type": "string"
},
Expand Down Expand Up @@ -87,7 +87,7 @@
"patternProperties": {
"^(?:(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}?)|(?:[A-Za-z]{4,8}))(?:-[A-Za-z]{4})?(?:-[A-Za-z]{2}|[0-9]{3})?(?:-(?:[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(?:-[A-WY-Za-wy-z0-9](?:-[A-Za-z0-9]{2,8})+)*$": {
"description": "String with no leading/trailing whitespace",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"type": "string"
}
},
Expand All @@ -100,7 +100,7 @@
"primary": {
"description": "The most commonly used name.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Primary",
"type": "string"
},
Expand Down Expand Up @@ -248,7 +248,7 @@
},
"license": {
"description": "Source data license name.\n\nThis should be a valid SPDX license identifier when available.\n\nIf omitted, contact the data provider for more license information.",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "License",
"type": "string"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/overture-schema-core/tests/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def test_feature_json_schema() -> None:
"property": {"type": "string"},
"dataset": {"type": "string"},
"license": {
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"type": "string",
},
"record_id": {"type": "string"},
Expand Down
8 changes: 4 additions & 4 deletions packages/overture-schema-divisions-theme/tests/division_area_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"value": {
"description": "The actual name value.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Value",
"type": "string"
},
Expand Down Expand Up @@ -78,7 +78,7 @@
"patternProperties": {
"^(?:(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}?)|(?:[A-Za-z]{4,8}))(?:-[A-Za-z]{4})?(?:-[A-Za-z]{2}|[0-9]{3})?(?:-(?:[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(?:-[A-WY-Za-wy-z0-9](?:-[A-Za-z0-9]{2,8})+)*$": {
"description": "String with no leading/trailing whitespace",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"type": "string"
}
},
Expand All @@ -91,7 +91,7 @@
"primary": {
"description": "The most commonly used name.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Primary",
"type": "string"
},
Expand Down Expand Up @@ -207,7 +207,7 @@
},
"license": {
"description": "Source data license name.\n\nThis should be a valid SPDX license identifier when available.\n\nIf omitted, contact the data provider for more license information.",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "License",
"type": "string"
},
Expand Down
12 changes: 6 additions & 6 deletions packages/overture-schema-divisions-theme/tests/division_baseline_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"name": {
"description": "Primary name of the division",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Name",
"type": "string"
},
Expand Down Expand Up @@ -133,7 +133,7 @@
"value": {
"description": "The actual name value.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Value",
"type": "string"
},
Expand Down Expand Up @@ -169,7 +169,7 @@
"patternProperties": {
"^(?:(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}?)|(?:[A-Za-z]{4,8}))(?:-[A-Za-z]{4})?(?:-[A-Za-z]{2}|[0-9]{3})?(?:-(?:[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(?:-[A-WY-Za-wy-z0-9](?:-[A-Za-z0-9]{2,8})+)*$": {
"description": "String with no leading/trailing whitespace",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"type": "string"
}
},
Expand All @@ -182,7 +182,7 @@
"primary": {
"description": "The most commonly used name.",
"minLength": 1,
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "Primary",
"type": "string"
},
Expand Down Expand Up @@ -310,7 +310,7 @@
},
"license": {
"description": "Source data license name.\n\nThis should be a valid SPDX license identifier when available.\n\nIf omitted, contact the data provider for more license information.",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"title": "License",
"type": "string"
},
Expand Down Expand Up @@ -589,7 +589,7 @@
"patternProperties": {
"^(?:(?:[A-Za-z]{2,3}(?:-[A-Za-z]{3}){0,3}?)|(?:[A-Za-z]{4,8}))(?:-[A-Za-z]{4})?(?:-[A-Za-z]{2}|[0-9]{3})?(?:-(?:[A-Za-z0-9]{5,8}|[0-9][A-Za-z0-9]{3}))*(?:-[A-WY-Za-wy-z0-9](?:-[A-Za-z0-9]{2,8})+)*$": {
"description": "String with no leading/trailing whitespace",
"pattern": "^(\\S.*)?\\S$",
"pattern": "^(\\S(.*\\S)?)?$",
"type": "string"
}
},
Expand Down
Loading