Fix negative xsd edge cases

eclipse-basyx · Nov 30, 2023 · 03facf5 · 03facf5
1 parent 9539172
commit 03facf5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/basyx/aas/model/datatypes.py b/basyx/aas/model/datatypes.py
@@ -235,31 +235,35 @@ class Float(float):
 class Long(int):
     def __new__(cls, *args, **kwargs):
         res = int.__new__(cls, *args, **kwargs)
-        if abs(res) > 2**63-1:
+        # [-9223372036854775808, 9223372036854775807]
+        if res > 2**63-1 or res < -2**63:
             raise ValueError("{} is out of the allowed range for type {}".format(res, cls.__name__))
         return res
 
 
 class Int(int):
     def __new__(cls, *args, **kwargs):
         res = int.__new__(cls, *args, **kwargs)
-        if abs(res) > 2**31-1:
+        # [-2147483648, 2147483647]
+        if res > 2**31-1 or res < -2**31:
             raise ValueError("{} is out of the allowed range for type {}".format(res, cls.__name__))
         return res
 
 
 class Short(int):
     def __new__(cls, *args, **kwargs):
         res = int.__new__(cls, *args, **kwargs)
-        if abs(res) > 2**15-1:
+        # [-32768, 32767]
+        if res > 2**15-1 or res < -2**15:
             raise ValueError("{} is out of the allowed range for type {}".format(res, cls.__name__))
         return res
 
 
 class Byte(int):
     def __new__(cls, *args, **kwargs):
         res = int.__new__(cls, *args, **kwargs)
-        if abs(res) > 2**7-1:
+        # [-128,127]
+        if res > 2**7-1 or res < -2**7:
             raise ValueError("{} is out of the allowed range for type {}".format(res, cls.__name__))
         return res
 

diff --git a/test/model/test_datatypes.py b/test/model/test_datatypes.py
@@ -21,11 +21,18 @@ def test_parse_int(self) -> None:
         self.assertEqual(8, model.datatypes.from_xsd("8", model.datatypes.Long))
         self.assertEqual(9, model.datatypes.from_xsd("9", model.datatypes.Int))
         self.assertEqual(10, model.datatypes.from_xsd("10", model.datatypes.Short))
+        self.assertEqual(-123456789012345678901234567890, model.datatypes.from_xsd("-123456789012345678901234567890", model.datatypes.Integer))
+        self.assertEqual(2147483647, model.datatypes.from_xsd("2147483647", model.datatypes.Int))
+        self.assertEqual(-2147483648, model.datatypes.from_xsd("-2147483648", model.datatypes.Int))
+        self.assertEqual(-32768, model.datatypes.from_xsd("-32768", model.datatypes.Short))
+        self.assertEqual(-128, model.datatypes.from_xsd("-128", model.datatypes.Byte))
+        self.assertEqual(-9223372036854775808, model.datatypes.from_xsd("-9223372036854775808", model.datatypes.Long))
 
     def test_serialize_int(self) -> None:
         self.assertEqual("5", model.datatypes.xsd_repr(model.datatypes.Integer(5)))
         self.assertEqual("6", model.datatypes.xsd_repr(model.datatypes.Byte(6)))
         self.assertEqual("7", model.datatypes.xsd_repr(model.datatypes.NonNegativeInteger(7)))
+        self.assertEqual("-128", model.datatypes.xsd_repr(model.datatypes.Byte(-128)))
 
     def test_range_error(self) -> None:
         with self.assertRaises(ValueError) as cm: