From b35c292140c86bd4d8bcaafb138938243c38952c Mon Sep 17 00:00:00 2001 From: Jookia Date: Wed, 19 Jun 2024 23:18:25 +1000 Subject: [PATCH 1/2] Tests: Use assertEqual instead of assertEquals This causes some test failures on my system at least. --- .../materialtests/TestMaterialFilter.py | 30 +++++++++---------- .../TestTopologicalNamingProblem.py | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Mod/Material/materialtests/TestMaterialFilter.py b/src/Mod/Material/materialtests/TestMaterialFilter.py index a484cb2409..0e9789cd46 100644 --- a/src/Mod/Material/materialtests/TestMaterialFilter.py +++ b/src/Mod/Material/materialtests/TestMaterialFilter.py @@ -108,20 +108,20 @@ class MaterialFilterTestCases(unittest.TestCase): self.assertEqual(len(self.MaterialManager.MaterialLibraries), 1) filtered = self.MaterialManager.filterMaterials(filter) - self.assertEquals(len(filtered), 4) + self.assertEqual(len(filtered), 4) filtered = self.MaterialManager.filterMaterials(filter, includeLegacy=True) - self.assertEquals(len(filtered), 5) + self.assertEqual(len(filtered), 5) # Create a basic rendering filter filter.Name = "Basic Appearance" filter.RequiredCompleteModels = [self.uuids.BasicRendering] filtered = self.MaterialManager.filterMaterials(filter) - self.assertEquals(len(filtered), 3) + self.assertEqual(len(filtered), 3) filtered = self.MaterialManager.filterMaterials(filter, includeLegacy=True) - self.assertEquals(len(filtered), 3) + self.assertEqual(len(filtered), 3) # Create an advanced rendering filter filter= Materials.MaterialFilter() @@ -129,10 +129,10 @@ class MaterialFilterTestCases(unittest.TestCase): filter.RequiredCompleteModels = [self.uuids.AdvancedRendering] filtered = self.MaterialManager.filterMaterials(filter) - self.assertEquals(len(filtered), 0) + self.assertEqual(len(filtered), 0) filtered = self.MaterialManager.filterMaterials(filter, includeLegacy=True) - self.assertEquals(len(filtered), 0) + self.assertEqual(len(filtered), 0) # Create a Density filter filter= Materials.MaterialFilter() @@ -140,10 +140,10 @@ class MaterialFilterTestCases(unittest.TestCase): filter.RequiredCompleteModels = [self.uuids.Density] filtered = self.MaterialManager.filterMaterials(filter) - self.assertEquals(len(filtered), 2) + self.assertEqual(len(filtered), 2) filtered = self.MaterialManager.filterMaterials(filter, includeLegacy=True) - self.assertEquals(len(filtered), 3) + self.assertEqual(len(filtered), 3) # Create a Hardness filter filter= Materials.MaterialFilter() @@ -151,10 +151,10 @@ class MaterialFilterTestCases(unittest.TestCase): filter.RequiredCompleteModels = [self.uuids.Hardness] filtered = self.MaterialManager.filterMaterials(filter) - self.assertEquals(len(filtered), 0) + self.assertEqual(len(filtered), 0) filtered = self.MaterialManager.filterMaterials(filter, includeLegacy=True) - self.assertEquals(len(filtered), 0) + self.assertEqual(len(filtered), 0) # Create a Density and Basic Rendering filter filter= Materials.MaterialFilter() @@ -162,10 +162,10 @@ class MaterialFilterTestCases(unittest.TestCase): filter.RequiredCompleteModels = [self.uuids.Density, self.uuids.BasicRendering] filtered = self.MaterialManager.filterMaterials(filter) - self.assertEquals(len(filtered), 1) + self.assertEqual(len(filtered), 1) filtered = self.MaterialManager.filterMaterials(filter, includeLegacy=True) - self.assertEquals(len(filtered), 1) + self.assertEqual(len(filtered), 1) # Create a Linear Elastic filter filter= Materials.MaterialFilter() @@ -173,17 +173,17 @@ class MaterialFilterTestCases(unittest.TestCase): filter.RequiredCompleteModels = [self.uuids.LinearElastic] filtered = self.MaterialManager.filterMaterials(filter) - self.assertEquals(len(filtered), 0) + self.assertEqual(len(filtered), 0) filtered = self.MaterialManager.filterMaterials(filter, includeLegacy=True) - self.assertEquals(len(filtered), 0) + self.assertEqual(len(filtered), 0) filter= Materials.MaterialFilter() filter.Name = "Linear Elastic - incomplete" filter.RequiredModels = [self.uuids.LinearElastic] filtered = self.MaterialManager.filterMaterials(filter) - self.assertEquals(len(filtered), 2) + self.assertEqual(len(filtered), 2) filtered = self.MaterialManager.filterMaterials(filter, includeLegacy=True) diff --git a/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py b/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py index 159b8adfa0..9c77c60c88 100644 --- a/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py +++ b/src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py @@ -969,7 +969,7 @@ class TestTopologicalNamingProblem(unittest.TestCase): self.assertEqual(self.Body.Shape.BoundBox.XMax,31.37) self.assertAlmostEqual(self.Body.Shape.BoundBox.YMax,25.2) self.assertEqual(self.Body.Shape.BoundBox.ZMax,20) - self.assertNotEquals(area1, area2) + self.assertNotEqual(area1, area2) def testShapeBinder(self): doc = self.Doc From b44b6f182df04ffee8ee98d8148f072bfe4fe18f Mon Sep 17 00:00:00 2001 From: Jookia Date: Wed, 19 Jun 2024 23:19:23 +1000 Subject: [PATCH 2/2] Tests: Specify QtWidgets.QDialogButtonBox.Close explicitly This seems needed for PySide6 on my system. --- src/Mod/Part/TestPartGui.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/Part/TestPartGui.py b/src/Mod/Part/TestPartGui.py index dc207cc831..3efaedfd54 100644 --- a/src/Mod/Part/TestPartGui.py +++ b/src/Mod/Part/TestPartGui.py @@ -96,7 +96,7 @@ class SectionCutTestCases(unittest.TestCase): dw = findDockWidget("Section Cutting") if dw: box = dw.findChild(QtWidgets.QDialogButtonBox) - button = box.button(box.Close) + button = box.button(QtWidgets.QDialogButtonBox.Close) button.click() else: print ("No Section Cutting panel found")