From da79e1ff86f48e6ea6f638efeae2c0096208601f Mon Sep 17 00:00:00 2001 From: plgarcia Date: Sat, 18 Nov 2017 22:04:57 +0100 Subject: [PATCH] Very minor problem. Test of sheets is impacted by the locale. The decimal separator may be , instead of . An assertEqualLocale function has been added to replace , by . in the values impacted by the locale with before comparison with the expected string containing a . as decimal separator. Works fine --- src/Mod/Path/PathTests/PathTestUtils.py | 5 +++++ src/Mod/Path/PathTests/TestPathSetupSheet.py | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Mod/Path/PathTests/PathTestUtils.py b/src/Mod/Path/PathTests/PathTestUtils.py index 368cec0368..c8b2faf6c7 100644 --- a/src/Mod/Path/PathTests/PathTestUtils.py +++ b/src/Mod/Path/PathTests/PathTestUtils.py @@ -127,3 +127,8 @@ class PathTestBase(unittest.TestCase): self.assertRoughly(c1.Parameters.get('I', 0), c2.Parameters.get('I', 0)) self.assertRoughly(c1.Parameters.get('J', 0), c2.Parameters.get('J', 0)) self.assertRoughly(c1.Parameters.get('K', 0), c2.Parameters.get('K', 0)) + + def assertEqualLocale(self,s1,s2): + """Verify that the 2 strings are equivalent, but converts eventual , into . for the first string that may be affected by locale.""" + self.assertEqual(s1.replace(",","."), s2) + diff --git a/src/Mod/Path/PathTests/TestPathSetupSheet.py b/src/Mod/Path/PathTests/TestPathSetupSheet.py index 111428e622..2fe00e189b 100644 --- a/src/Mod/Path/PathTests/TestPathSetupSheet.py +++ b/src/Mod/Path/PathTests/TestPathSetupSheet.py @@ -53,11 +53,11 @@ class TestPathSetupSheet(PathTestBase): attrs = ss.templateAttributes(True, True) - self.assertEqual(attrs[PathSetupSheet.Template.HorizRapid], '0.00 mm/s') - self.assertEqual(attrs[PathSetupSheet.Template.VertRapid], '0.00 mm/s') - self.assertEqual(attrs[PathSetupSheet.Template.SafeHeightOffset], '3.00 mm') + self.assertEqualLocale(attrs[PathSetupSheet.Template.HorizRapid], '0.00 mm/s') + self.assertEqualLocale(attrs[PathSetupSheet.Template.VertRapid], '0.00 mm/s') + self.assertEqualLocale(attrs[PathSetupSheet.Template.SafeHeightOffset], '3.00 mm') self.assertEqual(attrs[PathSetupSheet.Template.SafeHeightExpression], 'StartDepth+SetupSheet.SafeHeightOffset') - self.assertEqual(attrs[PathSetupSheet.Template.ClearanceHeightOffset], '5.00 mm') + self.assertEqualLocale(attrs[PathSetupSheet.Template.ClearanceHeightOffset], '5.00 mm') self.assertEqual(attrs[PathSetupSheet.Template.ClearanceHeightExpression], 'StartDepth+SetupSheet.ClearanceHeightOffset') def test01(self):