From 72d6c48bbaddc0ed9983dd3377315d8a65d6682d Mon Sep 17 00:00:00 2001
From: Bernd Hahnebach <bernd@bimstatik.org>
Date: Thu, 6 Dec 2018 10:15:53 +0100
Subject: [PATCH] FEM: unit tests, better name for unit test FreeCAD file names

---
 src/Mod/Fem/femtest/testccxtools.py        | 9 +++++----
 src/Mod/Fem/femtest/testcommon.py          | 9 +++++----
 src/Mod/Fem/femtest/testmesh.py            | 9 +++++----
 src/Mod/Fem/femtest/testsolverframework.py | 9 +++++----
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/Mod/Fem/femtest/testccxtools.py b/src/Mod/Fem/femtest/testccxtools.py
index 5291c83198..0591bd5695 100644
--- a/src/Mod/Fem/femtest/testccxtools.py
+++ b/src/Mod/Fem/femtest/testccxtools.py
@@ -35,12 +35,13 @@ from .testtools import fcc_print
 class FemCcxAnalysisTest(unittest.TestCase):
 
     def setUp(self):
+        self.doc_name = "TestsFemCcxTools"
         try:
-            FreeCAD.setActiveDocument("FemTest")
+            FreeCAD.setActiveDocument(self.doc_name)
         except:
-            FreeCAD.newDocument("FemTest")
+            FreeCAD.newDocument(self.doc_name)
         finally:
-            FreeCAD.setActiveDocument("FemTest")
+            FreeCAD.setActiveDocument(self.doc_name)
         self.active_doc = FreeCAD.ActiveDocument
         self.mesh_name = 'Mesh'
         self.temp_dir = testtools.get_fem_test_tmp_dir()
@@ -755,7 +756,7 @@ class FemCcxAnalysisTest(unittest.TestCase):
         fcc_print('--------------- End of FEM tests FLow 1D thermomech analysis ---------------')
 
     def tearDown(self):
-        FreeCAD.closeDocument("FemTest")
+        FreeCAD.closeDocument(self.doc_name)
         pass
 
 
diff --git a/src/Mod/Fem/femtest/testcommon.py b/src/Mod/Fem/femtest/testcommon.py
index d93bdef20e..90b50c0863 100644
--- a/src/Mod/Fem/femtest/testcommon.py
+++ b/src/Mod/Fem/femtest/testcommon.py
@@ -33,12 +33,13 @@ from .testtools import fcc_print
 class FemCommon(unittest.TestCase):
 
     def setUp(self):
+        self.doc_name = "TestsFemCommon"
         try:
-            FreeCAD.setActiveDocument("FemTest")
+            FreeCAD.setActiveDocument(self.doc_name)
         except:
-            FreeCAD.newDocument("FemTest")
+            FreeCAD.newDocument(self.doc_name)
         finally:
-            FreeCAD.setActiveDocument("FemTest")
+            FreeCAD.setActiveDocument(self.doc_name)
         self.active_doc = FreeCAD.ActiveDocument
 
     def test_read_frd_massflow_networkpressure(self):
@@ -539,5 +540,5 @@ class FemCommon(unittest.TestCase):
             self.assertTrue(im, 'Problem importing {0}'.format(mod))
 
     def tearDown(self):
-        FreeCAD.closeDocument("FemTest")
+        FreeCAD.closeDocument(self.doc_name)
         pass
diff --git a/src/Mod/Fem/femtest/testmesh.py b/src/Mod/Fem/femtest/testmesh.py
index 0837ead7bd..8cfcd5b396 100644
--- a/src/Mod/Fem/femtest/testmesh.py
+++ b/src/Mod/Fem/femtest/testmesh.py
@@ -33,12 +33,13 @@ from .testtools import fcc_print
 class FemMeshTest(unittest.TestCase):
 
     def setUp(self):
+        self.doc_name = "TestsFemMesh"
         try:
-            FreeCAD.setActiveDocument("FemTest")
+            FreeCAD.setActiveDocument(self.doc_name)
         except:
-            FreeCAD.newDocument("FemTest")
+            FreeCAD.newDocument(self.doc_name)
         finally:
-            FreeCAD.setActiveDocument("FemTest")
+            FreeCAD.setActiveDocument(self.doc_name)
         self.active_doc = FreeCAD.ActiveDocument
 
     def test_mesh_seg2_python(self):
@@ -203,5 +204,5 @@ class FemMeshTest(unittest.TestCase):
                         "Problem in test_writeAbaqus_precision, \n{0}\n{1}".format(read_node_line, expected))
 
     def tearDown(self):
-        FreeCAD.closeDocument("FemTest")
+        FreeCAD.closeDocument(self.doc_name)
         pass
diff --git a/src/Mod/Fem/femtest/testsolverframework.py b/src/Mod/Fem/femtest/testsolverframework.py
index db02ff4267..c59f61d2a1 100644
--- a/src/Mod/Fem/femtest/testsolverframework.py
+++ b/src/Mod/Fem/femtest/testsolverframework.py
@@ -34,12 +34,13 @@ from .testtools import fcc_print
 class SolverFrameWorkTest(unittest.TestCase):
 
     def setUp(self):
+        self.doc_name = "TestsFemSolverFrameWork"
         try:
-            FreeCAD.setActiveDocument("FemTest")
+            FreeCAD.setActiveDocument(self.doc_name)
         except:
-            FreeCAD.newDocument("FemTest")
+            FreeCAD.newDocument(self.doc_name)
         finally:
-            FreeCAD.setActiveDocument("FemTest")
+            FreeCAD.setActiveDocument(self.doc_name)
         self.active_doc = FreeCAD.ActiveDocument
         self.mesh_name = 'Mesh'
         self.temp_dir = testtools.get_fem_test_tmp_dir()
@@ -180,5 +181,5 @@ class SolverFrameWorkTest(unittest.TestCase):
         fcc_print('--------------- End of FEM tests solver frame work ---------------')
 
     def tearDown(self):
-        FreeCAD.closeDocument("FemTest")
+        FreeCAD.closeDocument(self.doc_name)
         pass