kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

CAM: Make CAM tests and serialization robust to locale-dependent decimal separators

Browse Source 
Updated CAM unit tests and LinuxCNC serializer to handle decimal separators consistently, ensuring tests pass regardless of system locale. Assertions now compare FreeCAD.Units.Quantity objects directly or normalize decimal separators in strings. LinuxCNC serializer output is forced to use periods for decimals.

src/Mod/CAM/CAMTests/TestPathToolBitListWidget.py:
- Normalize decimal separators in tool description assertions for locale robustness.

src/Mod/CAM/CAMTests/TestPathToolBitPropertyEditorWidget.py:
- Use FreeCAD.Units.Quantity for direct quantity comparisons in property editor tests.

src/Mod/CAM/CAMTests/TestPathToolBitSerializer.py:
- Compare deserialized and serialized quantities using FreeCAD.Units.Quantity for consistency.

src/Mod/CAM/CAMTests/TestPathToolShapeClasses.py:
- Compare parameter values and units directly instead of relying on string formatting.

src/Mod/CAM/Path/Tool/library/serializers/linuxcnc.py:
- Force period as decimal separator in LinuxCNC serializer output to avoid locale issues.
This commit is contained in:
Billy Huddleston
2025-11-19 21:26:05 -05:00
committed by Max Wilfinger
parent e937063e41
commit 9cab1f8f52
5 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/Mod/CAM/CAMTests/TestPathToolBitSerializer.py
View File

@@ -84,8 +84,12 @@ class TestCamoticsToolBitSerializer(_BaseToolBitSerializerTestCase):
self.assertIsInstance(deserialized_bit, ToolBit)
self.assertEqual(deserialized_bit.label, "Test Tool")
self.assertEqual(str(deserialized_bit.get_diameter()), "4.12 mm")
self.assertEqual(str(deserialized_bit.get_length()), "15.0 mm")
self.assertEqual(
deserialized_bit.get_diameter(), FreeCAD.Units.Quantity(4.12, FreeCAD.Units.Length)
)
self.assertEqual(
deserialized_bit.get_length(), FreeCAD.Units.Quantity(15.0, FreeCAD.Units.Length)
)
self.assertEqual(deserialized_bit.get_shape_name(), "Endmill")
@@ -99,8 +103,14 @@ class TestFCTBSerializer(_BaseToolBitSerializerTestCase):
data = json.loads(serialized_data.decode("utf-8"))
self.assertEqual(data.get("name"), "Test Tool")
self.assertEqual(data.get("shape"), "endmill.fcstd")
self.assertEqual(data.get("parameter", {}).get("Diameter"), "4.12 mm")
self.assertEqual(data.get("parameter", {}).get("Length"), "15.00 mm", data)
self.assertEqual(
FreeCAD.Units.Quantity(data.get("parameter", {}).get("Diameter")),
FreeCAD.Units.Quantity(4.12, FreeCAD.Units.Length),
)
self.assertEqual(
FreeCAD.Units.Quantity(data.get("parameter", {}).get("Length")),
FreeCAD.Units.Quantity(15.0, FreeCAD.Units.Length),
)
def test_extract_dependencies(self):
"""Test dependency extraction for FCTB."""
@@ -134,8 +144,12 @@ class TestFCTBSerializer(_BaseToolBitSerializerTestCase):
self.assertIsInstance(deserialized_bit, ToolBit)
self.assertEqual(deserialized_bit.label, "Test Tool")
self.assertEqual(deserialized_bit.get_shape_name(), "Endmill")
self.assertEqual(str(deserialized_bit.get_diameter()), "4.12 mm")
self.assertEqual(str(deserialized_bit.get_length()), "15.0 mm")
self.assertEqual(
deserialized_bit.get_diameter(), FreeCAD.Units.Quantity(4.12, FreeCAD.Units.Length)
)
self.assertEqual(
deserialized_bit.get_length(), FreeCAD.Units.Quantity(15.0, FreeCAD.Units.Length)
)
class TestYamlToolBitSerializer(_BaseToolBitSerializerTestCase):
@@ -150,8 +164,14 @@ class TestYamlToolBitSerializer(_BaseToolBitSerializerTestCase):
self.assertEqual(data.get("name"), "Test Tool")
self.assertEqual(data.get("shape"), "endmill.fcstd")
self.assertEqual(data.get("shape-type"), "Endmill")
self.assertEqual(data.get("parameter", {}).get("Diameter"), "4.12 mm")
self.assertEqual(data.get("parameter", {}).get("Length"), "15.00 mm")
self.assertEqual(
FreeCAD.Units.Quantity(data.get("parameter", {}).get("Diameter")),
FreeCAD.Units.Quantity(4.12, FreeCAD.Units.Length),
)
self.assertEqual(
FreeCAD.Units.Quantity(data.get("parameter", {}).get("Length")),
FreeCAD.Units.Quantity(15.0, FreeCAD.Units.Length),
)
def test_extract_dependencies(self):
"""Test dependency extraction for YAML."""
@@ -196,8 +216,12 @@ class TestYamlToolBitSerializer(_BaseToolBitSerializerTestCase):
self.assertEqual(deserialized_bit.id, "TestID")
self.assertEqual(deserialized_bit.label, "Test Tool")
self.assertEqual(deserialized_bit.get_shape_name(), "Endmill")
self.assertEqual(str(deserialized_bit.get_diameter()), "4.12 mm")
self.assertEqual(str(deserialized_bit.get_length()), "15.0 mm")
self.assertEqual(
deserialized_bit.get_diameter(), FreeCAD.Units.Quantity(4.12, FreeCAD.Units.Length)
)
self.assertEqual(
deserialized_bit.get_length(), FreeCAD.Units.Quantity(15.0, FreeCAD.Units.Length)
)
# Test with ID argument.
deserialized_bit = cast(