kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

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

Browse Source
This commit is contained in:
Bernd Hahnebach
2019-06-30 23:06:26 +02:00
parent 67d426efd0
commit b8f0de88bb
7 changed files with 77 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Mod/Fem/femtest/testccxtools.py
View File

@@ -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(

15
src/Mod/Fem/femtest/testcommon.py
View File

@@ -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
# ********************************************************************************************

15
src/Mod/Fem/femtest/testmaterial.py
View File

@@ -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
# ********************************************************************************************

30
src/Mod/Fem/femtest/testmesh.py
View File

@@ -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(),

29
src/Mod/Fem/femtest/testobject.py
View File

@@ -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
# ********************************************************************************************

15
src/Mod/Fem/femtest/testresult.py
View File

@@ -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
# ********************************************************************************************

17
src/Mod/Fem/femtest/testsolverframework.py
View File

@@ -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')