From b8f0de88bbd3e60f3cde761b34e2f573bbca00cf Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 30 Jun 2019 23:06:26 +0200 Subject: [PATCH] FEM: unit tests, set up documents without a try except --- src/Mod/Fem/femtest/testccxtools.py | 17 +++++++----- src/Mod/Fem/femtest/testcommon.py | 15 ++++++----- src/Mod/Fem/femtest/testmaterial.py | 15 ++++++----- src/Mod/Fem/femtest/testmesh.py | 30 ++++++++++++---------- src/Mod/Fem/femtest/testobject.py | 29 +++++++++++---------- src/Mod/Fem/femtest/testresult.py | 15 ++++++----- src/Mod/Fem/femtest/testsolverframework.py | 17 +++++++----- 7 files changed, 77 insertions(+), 61 deletions(-) diff --git a/src/Mod/Fem/femtest/testccxtools.py b/src/Mod/Fem/femtest/testccxtools.py index a695ca58ea..9e36af019f 100644 --- a/src/Mod/Fem/femtest/testccxtools.py +++ b/src/Mod/Fem/femtest/testccxtools.py @@ -41,15 +41,18 @@ class TestCcxTools(unittest.TestCase): def setUp( self ): - # init, is executed before every test - self.doc_name = "TestCcxTools" - try: - FreeCAD.setActiveDocument(self.doc_name) - except: + # setUp is executed before every test + # setting up a document to hold the tests + self.doc_name = self.__class__.__name__ + if FreeCAD.ActiveDocument: + if FreeCAD.ActiveDocument.Name != self.doc_name: + FreeCAD.newDocument(self.doc_name) + else: FreeCAD.newDocument(self.doc_name) - finally: - FreeCAD.setActiveDocument(self.doc_name) + FreeCAD.setActiveDocument(self.doc_name) self.active_doc = FreeCAD.ActiveDocument + + # more inits self.mesh_name = 'Mesh' self.temp_dir = testtools.get_fem_test_tmp_dir() self.test_file_dir = join( diff --git a/src/Mod/Fem/femtest/testcommon.py b/src/Mod/Fem/femtest/testcommon.py index 5f1aab9fb4..95a9e3a8fe 100644 --- a/src/Mod/Fem/femtest/testcommon.py +++ b/src/Mod/Fem/femtest/testcommon.py @@ -37,14 +37,15 @@ class TestFemCommon(unittest.TestCase): def setUp( self ): - # init, is executed before every test - self.doc_name = "TestsFemCommon" - try: - FreeCAD.setActiveDocument(self.doc_name) - except: + # setUp is executed before every test + # setting up a document to hold the tests + self.doc_name = self.__class__.__name__ + if FreeCAD.ActiveDocument: + if FreeCAD.ActiveDocument.Name != self.doc_name: + FreeCAD.newDocument(self.doc_name) + else: FreeCAD.newDocument(self.doc_name) - finally: - FreeCAD.setActiveDocument(self.doc_name) + FreeCAD.setActiveDocument(self.doc_name) self.active_doc = FreeCAD.ActiveDocument # ******************************************************************************************** diff --git a/src/Mod/Fem/femtest/testmaterial.py b/src/Mod/Fem/femtest/testmaterial.py index 113c736e60..42db855d0f 100644 --- a/src/Mod/Fem/femtest/testmaterial.py +++ b/src/Mod/Fem/femtest/testmaterial.py @@ -37,14 +37,15 @@ class TestMaterialUnits(unittest.TestCase): def setUp( self ): - # init, is executed before every test - self.doc_name = "TestMaterialUnits" - try: - FreeCAD.setActiveDocument(self.doc_name) - except: + # setUp is executed before every test + # setting up a document to hold the tests + self.doc_name = self.__class__.__name__ + if FreeCAD.ActiveDocument: + if FreeCAD.ActiveDocument.Name != self.doc_name: + FreeCAD.newDocument(self.doc_name) + else: FreeCAD.newDocument(self.doc_name) - finally: - FreeCAD.setActiveDocument(self.doc_name) + FreeCAD.setActiveDocument(self.doc_name) self.active_doc = FreeCAD.ActiveDocument # ******************************************************************************************** diff --git a/src/Mod/Fem/femtest/testmesh.py b/src/Mod/Fem/femtest/testmesh.py index 14f9e54d6d..332f143119 100644 --- a/src/Mod/Fem/femtest/testmesh.py +++ b/src/Mod/Fem/femtest/testmesh.py @@ -39,14 +39,15 @@ class TestMeshCommon(unittest.TestCase): def setUp( self ): - # init, is executed before every test - self.doc_name = "TestMeshCommon" - try: - FreeCAD.setActiveDocument(self.doc_name) - except: + # setUp is executed before every test + # setting up a document to hold the tests + self.doc_name = self.__class__.__name__ + if FreeCAD.ActiveDocument: + if FreeCAD.ActiveDocument.Name != self.doc_name: + FreeCAD.newDocument(self.doc_name) + else: FreeCAD.newDocument(self.doc_name) - finally: - FreeCAD.setActiveDocument(self.doc_name) + FreeCAD.setActiveDocument(self.doc_name) self.active_doc = FreeCAD.ActiveDocument # ******************************************************************************************** @@ -218,15 +219,18 @@ class TestMeshEleTetra10(unittest.TestCase): def setUp( self ): - self.doc_name = "TestMeshEleTetra10" - try: - FreeCAD.setActiveDocument(self.doc_name) - except: + # setUp is executed before every test + # setting up a document to hold the tests + self.doc_name = self.__class__.__name__ + if FreeCAD.ActiveDocument: + if FreeCAD.ActiveDocument.Name != self.doc_name: + FreeCAD.newDocument(self.doc_name) + else: FreeCAD.newDocument(self.doc_name) - finally: - FreeCAD.setActiveDocument(self.doc_name) + FreeCAD.setActiveDocument(self.doc_name) self.active_doc = FreeCAD.ActiveDocument + # more inits self.elem = 'tetra10' self.base_testfile = join( testtools.get_fem_test_home_dir(), diff --git a/src/Mod/Fem/femtest/testobject.py b/src/Mod/Fem/femtest/testobject.py index 4adb6e968b..502e6f3067 100644 --- a/src/Mod/Fem/femtest/testobject.py +++ b/src/Mod/Fem/femtest/testobject.py @@ -37,14 +37,15 @@ class TestObjectCreate(unittest.TestCase): def setUp( self ): - # init, is executed before every test - self.doc_name = "TestObjectCreate" - try: - FreeCAD.setActiveDocument(self.doc_name) - except: + # setUp is executed before every test + # setting up a document to hold the tests + self.doc_name = self.__class__.__name__ + if FreeCAD.ActiveDocument: + if FreeCAD.ActiveDocument.Name != self.doc_name: + FreeCAD.newDocument(self.doc_name) + else: FreeCAD.newDocument(self.doc_name) - finally: - FreeCAD.setActiveDocument(self.doc_name) + FreeCAD.setActiveDocument(self.doc_name) self.active_doc = FreeCAD.ActiveDocument # ******************************************************************************************** @@ -143,13 +144,15 @@ class TestObjectType(unittest.TestCase): def setUp( self ): - self.doc_name = "TestObjectType" - try: - FreeCAD.setActiveDocument(self.doc_name) - except: + # setUp is executed before every test + # setting up a document to hold the tests + self.doc_name = self.__class__.__name__ + if FreeCAD.ActiveDocument: + if FreeCAD.ActiveDocument.Name != self.doc_name: + FreeCAD.newDocument(self.doc_name) + else: FreeCAD.newDocument(self.doc_name) - finally: - FreeCAD.setActiveDocument(self.doc_name) + FreeCAD.setActiveDocument(self.doc_name) self.active_doc = FreeCAD.ActiveDocument # ******************************************************************************************** diff --git a/src/Mod/Fem/femtest/testresult.py b/src/Mod/Fem/femtest/testresult.py index d03fb24588..08dfc22c06 100644 --- a/src/Mod/Fem/femtest/testresult.py +++ b/src/Mod/Fem/femtest/testresult.py @@ -38,14 +38,15 @@ class TestResult(unittest.TestCase): def setUp( self ): - # init, is executed before every test - self.doc_name = "TestResult" - try: - FreeCAD.setActiveDocument(self.doc_name) - except: + # setUp is executed before every test + # setting up a document to hold the tests + self.doc_name = self.__class__.__name__ + if FreeCAD.ActiveDocument: + if FreeCAD.ActiveDocument.Name != self.doc_name: + FreeCAD.newDocument(self.doc_name) + else: FreeCAD.newDocument(self.doc_name) - finally: - FreeCAD.setActiveDocument(self.doc_name) + FreeCAD.setActiveDocument(self.doc_name) self.active_doc = FreeCAD.ActiveDocument # ******************************************************************************************** diff --git a/src/Mod/Fem/femtest/testsolverframework.py b/src/Mod/Fem/femtest/testsolverframework.py index 46923410e9..6446b60c95 100644 --- a/src/Mod/Fem/femtest/testsolverframework.py +++ b/src/Mod/Fem/femtest/testsolverframework.py @@ -40,15 +40,18 @@ class TestSolverFrameWork(unittest.TestCase): def setUp( self ): - # init, is executed before every test - self.doc_name = "TestSolverFrameWork" - try: - FreeCAD.setActiveDocument(self.doc_name) - except: + # setUp is executed before every test + # setting up a document to hold the tests + self.doc_name = self.__class__.__name__ + if FreeCAD.ActiveDocument: + if FreeCAD.ActiveDocument.Name != self.doc_name: + FreeCAD.newDocument(self.doc_name) + else: FreeCAD.newDocument(self.doc_name) - finally: - FreeCAD.setActiveDocument(self.doc_name) + FreeCAD.setActiveDocument(self.doc_name) self.active_doc = FreeCAD.ActiveDocument + + # more inits self.mesh_name = 'Mesh' self.temp_dir = testtools.get_fem_test_tmp_dir() self.test_file_dir = join(testtools.get_fem_test_home_dir(), 'ccx')