FEM: unit tests, set up documents without a try except

FreeCAD · Jun 30, 2019 · 757fa06 · 757fa06
1 parent 4715fc4
commit 757fa06
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 61 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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')