Skip to content

Fix XSD type name mapping for UnsignedInt and UnsignedByte #563

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
gaoflow wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix XSD type name mapping for UnsignedInt and UnsignedByte #563

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
3 changes: 2 additions & 1 deletion sdk/basyx/aas/model/datatypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,8 +397,9 @@ def from_string(cls, value: str) -> "NormalizedString":
NonNegativeInteger: "nonNegativeInteger",
PositiveInteger: "positiveInteger",
UnsignedLong: "unsignedLong",
UnsignedInt: "unsignedInt",
UnsignedShort: "unsignedShort",
UnsignedInt: "unsignedByte",
UnsignedByte: "unsignedByte",
AnyURI: "anyURI",
String: "string",
NormalizedString: "normalizedString",
Expand Down
15 changes: 15 additions & 0 deletions sdk/test/model/test_datatypes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,21 @@ def test_trivial_cast(self) -> None:
model.datatypes.trivial_cast("17", model.datatypes.Int)
self.assertEqual("'17' cannot be trivially casted into Int", str(cm_2.exception))

def test_xsd_type_name_mapping(self) -> None:
# UnsignedInt was mapped to "xs:unsignedByte" and UnsignedByte was
# missing entirely, so deserializing valueType "xs:unsignedInt" raised
# KeyError and "xs:unsignedByte" resolved to the wrong class (#560).
self.assertEqual("xs:unsignedInt", model.datatypes.XSD_TYPE_NAMES[model.datatypes.UnsignedInt])
self.assertEqual("xs:unsignedByte", model.datatypes.XSD_TYPE_NAMES[model.datatypes.UnsignedByte])
self.assertIs(model.datatypes.UnsignedInt, model.datatypes.XSD_TYPE_CLASSES["xs:unsignedInt"])
self.assertIs(model.datatypes.UnsignedByte, model.datatypes.XSD_TYPE_CLASSES["xs:unsignedByte"])

# XSD_TYPE_CLASSES is the inverse of XSD_TYPE_NAMES; every type must
# round-trip, which also guarantees the names are unique.
for type_, name in model.datatypes.XSD_TYPE_NAMES.items():
self.assertIs(type_, model.datatypes.XSD_TYPE_CLASSES[name])
self.assertEqual(len(model.datatypes.XSD_TYPE_NAMES), len(model.datatypes.XSD_TYPE_CLASSES))


class TestStringTypes(unittest.TestCase):
def test_normalized_string(self) -> None:
Expand Down