From f96c805dbb3fb93653e13f0c606f5e64bed2cce5 Mon Sep 17 00:00:00 2001 From: Markus Hovorka Date: Mon, 23 Sep 2019 21:16:45 +0200 Subject: [PATCH] FEM: Restructure python test modules/packages There is a new split into app and gui tests. For this purpose two packages where created: femtest.app and femtest.gui. Tests that don't require the GUI up and running are inside the femtest.app package. Tests that do require the GUI are inside the femtest.gui package. Also underscores where added to the module names: testcommon to test_common. --- src/Mod/Fem/App/FemMesh.cpp | 4 +- src/Mod/Fem/CMakeLists.txt | 110 +++++++++--------- src/Mod/Fem/TestFem.py | 33 +++--- .../femtest/{testfiles => app}/__init__.py | 0 .../{utilstest.py => app/support_utils.py} | 2 +- .../{testccxtools.py => app/test_ccxtools.py} | 22 ++-- .../{testcommon.py => app/test_common.py} | 4 +- .../test_femimport.py} | 2 +- .../{testmaterial.py => app/test_material.py} | 2 +- .../femtest/{testmesh.py => app/test_mesh.py} | 4 +- .../{testobject.py => app/test_object.py} | 4 +- .../{testresult.py => app/test_result.py} | 4 +- .../test_solverframework.py} | 8 +- .../{testfiles/ccx => data}/__init__.py | 0 .../{testfiles => data}/ccx/Flow1D_mesh.py | 0 .../ccx/Flow1D_thermomech.FCStd | Bin .../ccx/Flow1D_thermomech.dat | 0 .../ccx/Flow1D_thermomech.frd | 0 .../ccx/Flow1D_thermomech.inp | 0 .../ccx/Flow1D_thermomech_expected_values | 0 .../ccx/Flow1D_thermomech_inout_nodes.txt | 0 .../{testfiles/elmer => data/ccx}/__init__.py | 0 .../{testfiles => data}/ccx/cube.FCStd | Bin .../ccx/cube_frequency.FCStd | Bin .../ccx/cube_frequency.dat | 0 .../ccx/cube_frequency.frd | 0 .../ccx/cube_frequency.inp | 0 .../ccx/cube_frequency_expected_values | 0 .../{testfiles => data}/ccx/cube_mesh.py | 0 .../{testfiles => data}/ccx/cube_static.FCStd | Bin .../{testfiles => data}/ccx/cube_static.dat | 0 .../{testfiles => data}/ccx/cube_static.frd | 0 .../{testfiles => data}/ccx/cube_static.inp | 0 .../ccx/cube_static_expected_values | 0 .../{testfiles => data}/ccx/multimat.inp | 0 .../{testfiles => data}/ccx/multimat_mesh.py | 0 .../{testfiles => data}/ccx/spine_mesh.py | 0 .../{testfiles => data}/ccx/spine_points.csv | 0 .../ccx/spine_thermomech.FCStd | Bin .../ccx/spine_thermomech.dat | 0 .../ccx/spine_thermomech.frd | 0 .../ccx/spine_thermomech.inp | 0 .../ccx/spine_thermomech_expected_values | 0 .../{testfiles => data}/ccx/spine_volumes.csv | 0 .../elmer/ELMERSOLVER_STARTINFO | 0 .../mesh => data/elmer}/__init__.py | 0 .../{testfiles => data}/elmer/case.sif | 0 .../{testfiles => data}/elmer/group_mesh.geo | 0 src/Mod/Fem/femtest/data/mesh/__init__.py | 0 .../{testfiles => data}/mesh/tetra10_mesh.inp | 0 .../{testfiles => data}/mesh/tetra10_mesh.unv | 0 .../{testfiles => data}/mesh/tetra10_mesh.vtk | 0 .../{testfiles => data}/mesh/tetra10_mesh.yml | 0 .../{testfiles => data}/mesh/tetra10_mesh.z88 | 0 54 files changed, 102 insertions(+), 97 deletions(-) rename src/Mod/Fem/femtest/{testfiles => app}/__init__.py (100%) rename src/Mod/Fem/femtest/{utilstest.py => app/support_utils.py} (99%) rename src/Mod/Fem/femtest/{testccxtools.py => app/test_ccxtools.py} (98%) rename src/Mod/Fem/femtest/{testcommon.py => app/test_common.py} (98%) rename src/Mod/Fem/femtest/{testfemimport.py => app/test_femimport.py} (99%) rename src/Mod/Fem/femtest/{testmaterial.py => app/test_material.py} (99%) rename src/Mod/Fem/femtest/{testmesh.py => app/test_mesh.py} (99%) rename src/Mod/Fem/femtest/{testobject.py => app/test_object.py} (99%) rename src/Mod/Fem/femtest/{testresult.py => app/test_result.py} (99%) rename src/Mod/Fem/femtest/{testsolverframework.py => app/test_solverframework.py} (98%) rename src/Mod/Fem/femtest/{testfiles/ccx => data}/__init__.py (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/Flow1D_mesh.py (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/Flow1D_thermomech.FCStd (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/Flow1D_thermomech.dat (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/Flow1D_thermomech.frd (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/Flow1D_thermomech.inp (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/Flow1D_thermomech_expected_values (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/Flow1D_thermomech_inout_nodes.txt (100%) rename src/Mod/Fem/femtest/{testfiles/elmer => data/ccx}/__init__.py (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube.FCStd (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube_frequency.FCStd (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube_frequency.dat (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube_frequency.frd (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube_frequency.inp (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube_frequency_expected_values (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube_mesh.py (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube_static.FCStd (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube_static.dat (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube_static.frd (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube_static.inp (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/cube_static_expected_values (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/multimat.inp (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/multimat_mesh.py (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/spine_mesh.py (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/spine_points.csv (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/spine_thermomech.FCStd (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/spine_thermomech.dat (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/spine_thermomech.frd (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/spine_thermomech.inp (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/spine_thermomech_expected_values (100%) rename src/Mod/Fem/femtest/{testfiles => data}/ccx/spine_volumes.csv (100%) rename src/Mod/Fem/femtest/{testfiles => data}/elmer/ELMERSOLVER_STARTINFO (100%) rename src/Mod/Fem/femtest/{testfiles/mesh => data/elmer}/__init__.py (100%) rename src/Mod/Fem/femtest/{testfiles => data}/elmer/case.sif (100%) rename src/Mod/Fem/femtest/{testfiles => data}/elmer/group_mesh.geo (100%) create mode 100644 src/Mod/Fem/femtest/data/mesh/__init__.py rename src/Mod/Fem/femtest/{testfiles => data}/mesh/tetra10_mesh.inp (100%) rename src/Mod/Fem/femtest/{testfiles => data}/mesh/tetra10_mesh.unv (100%) rename src/Mod/Fem/femtest/{testfiles => data}/mesh/tetra10_mesh.vtk (100%) rename src/Mod/Fem/femtest/{testfiles => data}/mesh/tetra10_mesh.yml (100%) rename src/Mod/Fem/femtest/{testfiles => data}/mesh/tetra10_mesh.z88 (100%) diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index 6cbf412d19..a544125bef 100644 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -1179,7 +1179,7 @@ void FemMesh::readAbaqus(const std::string &FileName) /* Python command to read Abaqus inp mesh file from test suite: from feminout.importInpMesh import read as read_inp - femmesh = read_inp(FreeCAD.ConfigGet("AppHomePath") + 'Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.inp') + femmesh = read_inp(FreeCAD.ConfigGet("AppHomePath") + 'Mod/Fem/femtest/data/mesh/tetra10_mesh.inp') */ PyObject* module = PyImport_ImportModule("feminout.importInpMesh"); @@ -1215,7 +1215,7 @@ void FemMesh::readZ88(const std::string &FileName) /* Python command to read Z88 mesh file from test suite: from feminout.importZ88Mesh import read as read_z88 - femmesh = read_z88(FreeCAD.ConfigGet("AppHomePath") + 'Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.z88') + femmesh = read_z88(FreeCAD.ConfigGet("AppHomePath") + 'Mod/Fem/femtest/data/mesh/tetra10_mesh.z88') */ PyObject* module = PyImport_ImportModule("feminout.importZ88Mesh"); diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index 0dde69df42..9a7606b3e3 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -130,66 +130,70 @@ SET(FemSolverZ88_SRCS SET(FemTests_SRCS femtest/__init__.py - femtest/testccxtools.py - femtest/testcommon.py - femtest/testfemimport.py - femtest/testmaterial.py - femtest/testmesh.py - femtest/testobject.py - femtest/testresult.py - femtest/testsolverframework.py - femtest/utilstest.py +) + +SET(FemTestsApp_SRCS + femtest/app/__init__.py + femtest/app/support_utils.py + femtest/app/test_ccxtools.py + femtest/app/test_common.py + femtest/app/test_femimport.py + femtest/app/test_material.py + femtest/app/test_mesh.py + femtest/app/test_object.py + femtest/app/test_result.py + femtest/app/test_solverframework.py ) SET(FemTestsFiles_SRCS - femtest/testfiles/__init__.py + femtest/data/__init__.py ) SET(FemTestsCcx_SRCS - femtest/testfiles/ccx/__init__.py - femtest/testfiles/ccx/cube_mesh.py - femtest/testfiles/ccx/cube_frequency.inp - femtest/testfiles/ccx/cube_frequency.dat - femtest/testfiles/ccx/cube_frequency.frd - femtest/testfiles/ccx/cube_frequency_expected_values - femtest/testfiles/ccx/cube_frequency.FCStd - femtest/testfiles/ccx/cube_static.inp - femtest/testfiles/ccx/cube_static.dat - femtest/testfiles/ccx/cube_static.frd - femtest/testfiles/ccx/cube_static_expected_values - femtest/testfiles/ccx/cube_static.FCStd - femtest/testfiles/ccx/cube.FCStd - femtest/testfiles/ccx/multimat.inp - femtest/testfiles/ccx/multimat_mesh.py - femtest/testfiles/ccx/spine_mesh.py - femtest/testfiles/ccx/spine_thermomech.inp - femtest/testfiles/ccx/spine_thermomech.dat - femtest/testfiles/ccx/spine_thermomech.frd - femtest/testfiles/ccx/spine_thermomech_expected_values - femtest/testfiles/ccx/spine_thermomech.FCStd - femtest/testfiles/ccx/Flow1D_mesh.py - femtest/testfiles/ccx/Flow1D_thermomech.inp - femtest/testfiles/ccx/Flow1D_thermomech.dat - femtest/testfiles/ccx/Flow1D_thermomech.frd - femtest/testfiles/ccx/Flow1D_thermomech_expected_values - femtest/testfiles/ccx/Flow1D_thermomech_inout_nodes.txt - femtest/testfiles/ccx/Flow1D_thermomech.FCStd + femtest/data/ccx/__init__.py + femtest/data/ccx/cube_mesh.py + femtest/data/ccx/cube_frequency.inp + femtest/data/ccx/cube_frequency.dat + femtest/data/ccx/cube_frequency.frd + femtest/data/ccx/cube_frequency_expected_values + femtest/data/ccx/cube_frequency.FCStd + femtest/data/ccx/cube_static.inp + femtest/data/ccx/cube_static.dat + femtest/data/ccx/cube_static.frd + femtest/data/ccx/cube_static_expected_values + femtest/data/ccx/cube_static.FCStd + femtest/data/ccx/cube.FCStd + femtest/data/ccx/multimat.inp + femtest/data/ccx/multimat_mesh.py + femtest/data/ccx/spine_mesh.py + femtest/data/ccx/spine_thermomech.inp + femtest/data/ccx/spine_thermomech.dat + femtest/data/ccx/spine_thermomech.frd + femtest/data/ccx/spine_thermomech_expected_values + femtest/data/ccx/spine_thermomech.FCStd + femtest/data/ccx/Flow1D_mesh.py + femtest/data/ccx/Flow1D_thermomech.inp + femtest/data/ccx/Flow1D_thermomech.dat + femtest/data/ccx/Flow1D_thermomech.frd + femtest/data/ccx/Flow1D_thermomech_expected_values + femtest/data/ccx/Flow1D_thermomech_inout_nodes.txt + femtest/data/ccx/Flow1D_thermomech.FCStd ) SET(FemTestsElmer_SRCS - femtest/testfiles/elmer/__init__.py - femtest/testfiles/elmer/case.sif - femtest/testfiles/elmer/group_mesh.geo - femtest/testfiles/elmer/ELMERSOLVER_STARTINFO + femtest/data/elmer/__init__.py + femtest/data/elmer/case.sif + femtest/data/elmer/group_mesh.geo + femtest/data/elmer/ELMERSOLVER_STARTINFO ) SET(FemTestsMesh_SRCS - femtest/testfiles/mesh/__init__.py - femtest/testfiles/mesh/tetra10_mesh.inp - femtest/testfiles/mesh/tetra10_mesh.unv - femtest/testfiles/mesh/tetra10_mesh.vtk - femtest/testfiles/mesh/tetra10_mesh.yml - femtest/testfiles/mesh/tetra10_mesh.z88 + femtest/data/mesh/__init__.py + femtest/data/mesh/tetra10_mesh.inp + femtest/data/mesh/tetra10_mesh.unv + femtest/data/mesh/tetra10_mesh.vtk + femtest/data/mesh/tetra10_mesh.yml + femtest/data/mesh/tetra10_mesh.z88 ) SET(FemTools_SRCS @@ -237,6 +241,7 @@ SET(FemAllScripts ${FemSolverFenics_SRCS} ${FemSolverZ88_SRCS} ${FemTests_SRCS} + ${FemTestsApp_SRCS} ${FemTestsFiles_SRCS} ${FemTestsCcx_SRCS} ${FemTestsElmer_SRCS} @@ -268,10 +273,11 @@ INSTALL(FILES ${FemSolverElmerEquations_SRCS} DESTINATION Mod/Fem/femsolver/elme INSTALL(FILES ${FemSolverFenics_SRCS} DESTINATION Mod/Fem/femsolver/fenics) INSTALL(FILES ${FemSolverZ88_SRCS} DESTINATION Mod/Fem/femsolver/z88) INSTALL(FILES ${FemTests_SRCS} DESTINATION Mod/Fem/femtest) -INSTALL(FILES ${FemTestsFiles_SRCS} DESTINATION Mod/Fem/femtest/testfiles) -INSTALL(FILES ${FemTestsCcx_SRCS} DESTINATION Mod/Fem/femtest/testfiles/ccx) -INSTALL(FILES ${FemTestsElmer_SRCS} DESTINATION Mod/Fem/femtest/testfiles/elmer) -INSTALL(FILES ${FemTestsMesh_SRCS} DESTINATION Mod/Fem/femtest/testfiles/mesh) +INSTALL(FILES ${FemTestsApp_SRCS} DESTINATION Mod/Fem/femtest/app) +INSTALL(FILES ${FemTestsFiles_SRCS} DESTINATION Mod/Fem/femtest/data) +INSTALL(FILES ${FemTestsCcx_SRCS} DESTINATION Mod/Fem/femtest/data/ccx) +INSTALL(FILES ${FemTestsElmer_SRCS} DESTINATION Mod/Fem/femtest/data/elmer) +INSTALL(FILES ${FemTestsMesh_SRCS} DESTINATION Mod/Fem/femtest/data/mesh) INSTALL(FILES ${FemTools_SRCS} DESTINATION Mod/Fem/femtools) INSTALL(FILES ${FemObjectsScripts_SRCS} DESTINATION Mod/Fem/femobjects) diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py index d181777a6d..fdeb9bdfa7 100644 --- a/src/Mod/Fem/TestFem.py +++ b/src/Mod/Fem/TestFem.py @@ -26,16 +26,16 @@ # Unit test for the FEM module # to get the right order import as is used -from femtest.testfemimport import TestFemImport as FemTest01 -from femtest.testcommon import TestFemCommon as FemTest02 -from femtest.testobject import TestObjectCreate as FemTest03 -from femtest.testobject import TestObjectType as FemTest04 -from femtest.testmaterial import TestMaterialUnits as FemTest05 -from femtest.testmesh import TestMeshCommon as FemTest06 -from femtest.testmesh import TestMeshEleTetra10 as FemTest07 -from femtest.testresult import TestResult as FemTest08 -from femtest.testccxtools import TestCcxTools as FemTest09 -from femtest.testsolverframework import TestSolverFrameWork as FemTest10 +from femtest.app.test_femimport import TestFemImport as FemTest01 +from femtest.app.test_common import TestFemCommon as FemTest02 +from femtest.app.test_object import TestObjectCreate as FemTest03 +from femtest.app.test_object import TestObjectType as FemTest04 +from femtest.app.test_material import TestMaterialUnits as FemTest05 +from femtest.app.test_mesh import TestMeshCommon as FemTest06 +from femtest.app.test_mesh import TestMeshEleTetra10 as FemTest07 +from femtest.app.test_result import TestResult as FemTest08 +from femtest.app.test_ccxtools import TestCcxTools as FemTest09 +from femtest.app.test_solverframework import TestSolverFrameWork as FemTest10 # dummy usage to get flake8 and lgtm quiet False if FemTest01.__name__ else True @@ -258,13 +258,12 @@ unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.t # open files from FEM test suite source code # be careful on updating these files, they contain the original results! # TODO update files, because some of them have non-existing FEM object classes -app_home = FreeCAD.ConfigGet("AppHomePath") -doc = FreeCAD.open(app_home + "Mod/Fem/femtest/testfiles/ccx/cube.FCStd") -doc = FreeCAD.open(app_home + "Mod/Fem/femtest/testfiles/ccx/cube_frequency.FCStd") -doc = FreeCAD.open(app_home + "Mod/Fem/femtest/testfiles/ccx/cube_static.FCStd") -doc = FreeCAD.open(app_home + "Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.FCStd") -doc = FreeCAD.open(app_home + "Mod/Fem/femtest/testfiles/ccx/multimat.FCStd") -doc = FreeCAD.open(app_home + "Mod/Fem/femtest/testfiles/ccx/spine_thermomech.FCStd") +doc = FreeCAD.open(FreeCAD.ConfigGet("AppHomePath") + 'Mod/Fem/femtest/data/ccx/cube.FCStd') +doc = FreeCAD.open(FreeCAD.ConfigGet("AppHomePath") + 'Mod/Fem/femtest/data/ccx/cube_frequency.FCStd') +doc = FreeCAD.open(FreeCAD.ConfigGet("AppHomePath") + 'Mod/Fem/femtest/data/ccx/cube_static.FCStd') +doc = FreeCAD.open(FreeCAD.ConfigGet("AppHomePath") + 'Mod/Fem/femtest/data/ccx/Flow1D_thermomech.FCStd') +doc = FreeCAD.open(FreeCAD.ConfigGet("AppHomePath") + 'Mod/Fem/femtest/data/ccx/multimat.FCStd') +doc = FreeCAD.open(FreeCAD.ConfigGet("AppHomePath") + 'Mod/Fem/femtest/data/ccx/spine_thermomech.FCStd') # open files generated from test suite import femtest.utilstest as ut diff --git a/src/Mod/Fem/femtest/testfiles/__init__.py b/src/Mod/Fem/femtest/app/__init__.py similarity index 100% rename from src/Mod/Fem/femtest/testfiles/__init__.py rename to src/Mod/Fem/femtest/app/__init__.py diff --git a/src/Mod/Fem/femtest/utilstest.py b/src/Mod/Fem/femtest/app/support_utils.py similarity index 99% rename from src/Mod/Fem/femtest/utilstest.py rename to src/Mod/Fem/femtest/app/support_utils.py index d0deb96fb5..ecb6f740ca 100644 --- a/src/Mod/Fem/femtest/utilstest.py +++ b/src/Mod/Fem/femtest/app/support_utils.py @@ -36,7 +36,7 @@ from os.path import join def get_fem_test_home_dir( ): - return join(FreeCAD.getHomePath(), "Mod", "Fem", "femtest", "testfiles") + return join(FreeCAD.getHomePath(), "Mod", "Fem", "femtest", "data") def get_fem_test_tmp_dir( diff --git a/src/Mod/Fem/femtest/testccxtools.py b/src/Mod/Fem/femtest/app/test_ccxtools.py similarity index 98% rename from src/Mod/Fem/femtest/testccxtools.py rename to src/Mod/Fem/femtest/app/test_ccxtools.py index 0c49c2ad7f..d0956973e1 100644 --- a/src/Mod/Fem/femtest/testccxtools.py +++ b/src/Mod/Fem/femtest/app/test_ccxtools.py @@ -28,8 +28,8 @@ from femtools import ccxtools import FreeCAD import ObjectsFem import unittest -from . import utilstest as testtools -from .utilstest import fcc_print +from . import support_utils as testtools +from .support_utils import fcc_print from os.path import join @@ -167,8 +167,8 @@ class TestCcxTools(unittest.TestCase): analysis.addObject(pressure_constraint) fcc_print("Checking FEM new mesh...") - from .testfiles.ccx.cube_mesh import create_nodes_cube - from .testfiles.ccx.cube_mesh import create_elements_cube + from ..data.ccx.cube_mesh import create_nodes_cube + from ..data.ccx.cube_mesh import create_elements_cube mesh = Fem.FemMesh() ret = create_nodes_cube(mesh) self.assertTrue( @@ -380,7 +380,7 @@ class TestCcxTools(unittest.TestCase): analysis.addObject(pressure_constraint) mesh = Fem.FemMesh() - import femtest.testfiles.ccx.multimat_mesh as multimatmesh + import femtest.data.ccx.multimat_mesh as multimatmesh multimatmesh.create_nodes(mesh) multimatmesh.create_elements(mesh) mesh_object = self.active_doc.addObject("Fem::FemMeshObject", self.mesh_name) @@ -481,8 +481,8 @@ class TestCcxTools(unittest.TestCase): analysis.addObject(material_object) fcc_print("Checking FEM new mesh...") - from .testfiles.ccx.cube_mesh import create_nodes_cube - from .testfiles.ccx.cube_mesh import create_elements_cube + from ..data.ccx.cube_mesh import create_nodes_cube + from ..data.ccx.cube_mesh import create_elements_cube mesh = Fem.FemMesh() ret = create_nodes_cube(mesh) self.assertTrue(ret, "Import of mesh nodes failed") @@ -704,8 +704,8 @@ class TestCcxTools(unittest.TestCase): analysis.addObject(heatflux_constraint) fcc_print("Checking FEM new mesh...") - from .testfiles.ccx.spine_mesh import create_nodes_spine - from .testfiles.ccx.spine_mesh import create_elements_spine + from ..data.ccx.spine_mesh import create_nodes_spine + from ..data.ccx.spine_mesh import create_elements_spine mesh = Fem.FemMesh() ret = create_nodes_spine(mesh) self.assertTrue( @@ -1106,8 +1106,8 @@ class TestCcxTools(unittest.TestCase): analysis.addObject(Flow1d_self_weight) fcc_print("Checking FEM new mesh...") - from .testfiles.ccx.Flow1D_mesh import create_nodes_Flow1D - from .testfiles.ccx.Flow1D_mesh import create_elements_Flow1D + from ..data.ccx.Flow1D_mesh import create_nodes_Flow1D + from ..data.ccx.Flow1D_mesh import create_elements_Flow1D mesh = Fem.FemMesh() ret = create_nodes_Flow1D(mesh) self.assertTrue(ret, "Import of mesh nodes failed") diff --git a/src/Mod/Fem/femtest/testcommon.py b/src/Mod/Fem/femtest/app/test_common.py similarity index 98% rename from src/Mod/Fem/femtest/testcommon.py rename to src/Mod/Fem/femtest/app/test_common.py index 4f5334253c..93170e1606 100644 --- a/src/Mod/Fem/femtest/testcommon.py +++ b/src/Mod/Fem/femtest/app/test_common.py @@ -26,8 +26,8 @@ import FreeCAD import ObjectsFem import unittest -from . import utilstest as testtools -from .utilstest import fcc_print +from . import support_utils as testtools +from .support_utils import fcc_print class TestFemCommon(unittest.TestCase): diff --git a/src/Mod/Fem/femtest/testfemimport.py b/src/Mod/Fem/femtest/app/test_femimport.py similarity index 99% rename from src/Mod/Fem/femtest/testfemimport.py rename to src/Mod/Fem/femtest/app/test_femimport.py index de4cc42532..7d6e6bc100 100644 --- a/src/Mod/Fem/femtest/testfemimport.py +++ b/src/Mod/Fem/femtest/app/test_femimport.py @@ -26,7 +26,7 @@ import unittest import FreeCAD -from femtest.utilstest import fcc_print +from .support_utils import fcc_print class TestFemImport(unittest.TestCase): diff --git a/src/Mod/Fem/femtest/testmaterial.py b/src/Mod/Fem/femtest/app/test_material.py similarity index 99% rename from src/Mod/Fem/femtest/testmaterial.py rename to src/Mod/Fem/femtest/app/test_material.py index 47c43317e8..1accd77366 100644 --- a/src/Mod/Fem/femtest/testmaterial.py +++ b/src/Mod/Fem/femtest/app/test_material.py @@ -25,7 +25,7 @@ import FreeCAD import unittest -from .utilstest import fcc_print +from .support_utils import fcc_print from os.path import join diff --git a/src/Mod/Fem/femtest/testmesh.py b/src/Mod/Fem/femtest/app/test_mesh.py similarity index 99% rename from src/Mod/Fem/femtest/testmesh.py rename to src/Mod/Fem/femtest/app/test_mesh.py index 28dad0c37f..a5c792e176 100644 --- a/src/Mod/Fem/femtest/testmesh.py +++ b/src/Mod/Fem/femtest/app/test_mesh.py @@ -26,8 +26,8 @@ import Fem import FreeCAD import unittest -from . import utilstest as testtools -from .utilstest import fcc_print +from . import support_utils as testtools +from .support_utils import fcc_print from os.path import join diff --git a/src/Mod/Fem/femtest/testobject.py b/src/Mod/Fem/femtest/app/test_object.py similarity index 99% rename from src/Mod/Fem/femtest/testobject.py rename to src/Mod/Fem/femtest/app/test_object.py index a24aba05ab..3c7ad38d40 100644 --- a/src/Mod/Fem/femtest/testobject.py +++ b/src/Mod/Fem/femtest/app/test_object.py @@ -26,8 +26,8 @@ import FreeCAD import ObjectsFem import unittest -from . import utilstest as testtools -from .utilstest import fcc_print +from . import support_utils as testtools +from .support_utils import fcc_print class TestObjectCreate(unittest.TestCase): diff --git a/src/Mod/Fem/femtest/testresult.py b/src/Mod/Fem/femtest/app/test_result.py similarity index 99% rename from src/Mod/Fem/femtest/testresult.py rename to src/Mod/Fem/femtest/app/test_result.py index b4f94e0543..1d4a39a2ac 100644 --- a/src/Mod/Fem/femtest/testresult.py +++ b/src/Mod/Fem/femtest/app/test_result.py @@ -25,8 +25,8 @@ import FreeCAD import unittest -from . import utilstest as testtools -from .utilstest import fcc_print +from . import support_utils as testtools +from .support_utils import fcc_print from os.path import join diff --git a/src/Mod/Fem/femtest/testsolverframework.py b/src/Mod/Fem/femtest/app/test_solverframework.py similarity index 98% rename from src/Mod/Fem/femtest/testsolverframework.py rename to src/Mod/Fem/femtest/app/test_solverframework.py index b7ea497659..fa0dbce4d2 100644 --- a/src/Mod/Fem/femtest/testsolverframework.py +++ b/src/Mod/Fem/femtest/app/test_solverframework.py @@ -27,8 +27,8 @@ import FreeCAD import ObjectsFem import femsolver.run import unittest -from . import utilstest as testtools -from .utilstest import fcc_print +from . import support_utils as testtools +from .support_utils import fcc_print from os.path import join @@ -127,8 +127,8 @@ class TestSolverFrameWork(unittest.TestCase): analysis.addObject(pressure_constraint) fcc_print("Checking FEM new mesh...") - from .testfiles.ccx.cube_mesh import create_nodes_cube - from .testfiles.ccx.cube_mesh import create_elements_cube + from ..data.ccx.cube_mesh import create_nodes_cube + from ..data.ccx.cube_mesh import create_elements_cube mesh = Fem.FemMesh() ret = create_nodes_cube(mesh) self.assertTrue(ret, "Import of mesh nodes failed") diff --git a/src/Mod/Fem/femtest/testfiles/ccx/__init__.py b/src/Mod/Fem/femtest/data/__init__.py similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/__init__.py rename to src/Mod/Fem/femtest/data/__init__.py diff --git a/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_mesh.py b/src/Mod/Fem/femtest/data/ccx/Flow1D_mesh.py similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/Flow1D_mesh.py rename to src/Mod/Fem/femtest/data/ccx/Flow1D_mesh.py diff --git a/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.FCStd b/src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech.FCStd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.FCStd rename to src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech.FCStd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.dat b/src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech.dat similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.dat rename to src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech.dat diff --git a/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.frd b/src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech.frd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.frd rename to src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech.frd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.inp b/src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech.inp similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech.inp rename to src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech.inp diff --git a/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech_expected_values b/src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech_expected_values similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech_expected_values rename to src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech_expected_values diff --git a/src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech_inout_nodes.txt b/src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech_inout_nodes.txt similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/Flow1D_thermomech_inout_nodes.txt rename to src/Mod/Fem/femtest/data/ccx/Flow1D_thermomech_inout_nodes.txt diff --git a/src/Mod/Fem/femtest/testfiles/elmer/__init__.py b/src/Mod/Fem/femtest/data/ccx/__init__.py similarity index 100% rename from src/Mod/Fem/femtest/testfiles/elmer/__init__.py rename to src/Mod/Fem/femtest/data/ccx/__init__.py diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube.FCStd b/src/Mod/Fem/femtest/data/ccx/cube.FCStd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube.FCStd rename to src/Mod/Fem/femtest/data/ccx/cube.FCStd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.FCStd b/src/Mod/Fem/femtest/data/ccx/cube_frequency.FCStd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.FCStd rename to src/Mod/Fem/femtest/data/ccx/cube_frequency.FCStd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.dat b/src/Mod/Fem/femtest/data/ccx/cube_frequency.dat similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.dat rename to src/Mod/Fem/femtest/data/ccx/cube_frequency.dat diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.frd b/src/Mod/Fem/femtest/data/ccx/cube_frequency.frd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.frd rename to src/Mod/Fem/femtest/data/ccx/cube_frequency.frd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.inp b/src/Mod/Fem/femtest/data/ccx/cube_frequency.inp similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_frequency.inp rename to src/Mod/Fem/femtest/data/ccx/cube_frequency.inp diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_frequency_expected_values b/src/Mod/Fem/femtest/data/ccx/cube_frequency_expected_values similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_frequency_expected_values rename to src/Mod/Fem/femtest/data/ccx/cube_frequency_expected_values diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_mesh.py b/src/Mod/Fem/femtest/data/ccx/cube_mesh.py similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_mesh.py rename to src/Mod/Fem/femtest/data/ccx/cube_mesh.py diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_static.FCStd b/src/Mod/Fem/femtest/data/ccx/cube_static.FCStd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_static.FCStd rename to src/Mod/Fem/femtest/data/ccx/cube_static.FCStd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_static.dat b/src/Mod/Fem/femtest/data/ccx/cube_static.dat similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_static.dat rename to src/Mod/Fem/femtest/data/ccx/cube_static.dat diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_static.frd b/src/Mod/Fem/femtest/data/ccx/cube_static.frd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_static.frd rename to src/Mod/Fem/femtest/data/ccx/cube_static.frd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_static.inp b/src/Mod/Fem/femtest/data/ccx/cube_static.inp similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_static.inp rename to src/Mod/Fem/femtest/data/ccx/cube_static.inp diff --git a/src/Mod/Fem/femtest/testfiles/ccx/cube_static_expected_values b/src/Mod/Fem/femtest/data/ccx/cube_static_expected_values similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/cube_static_expected_values rename to src/Mod/Fem/femtest/data/ccx/cube_static_expected_values diff --git a/src/Mod/Fem/femtest/testfiles/ccx/multimat.inp b/src/Mod/Fem/femtest/data/ccx/multimat.inp similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/multimat.inp rename to src/Mod/Fem/femtest/data/ccx/multimat.inp diff --git a/src/Mod/Fem/femtest/testfiles/ccx/multimat_mesh.py b/src/Mod/Fem/femtest/data/ccx/multimat_mesh.py similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/multimat_mesh.py rename to src/Mod/Fem/femtest/data/ccx/multimat_mesh.py diff --git a/src/Mod/Fem/femtest/testfiles/ccx/spine_mesh.py b/src/Mod/Fem/femtest/data/ccx/spine_mesh.py similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/spine_mesh.py rename to src/Mod/Fem/femtest/data/ccx/spine_mesh.py diff --git a/src/Mod/Fem/femtest/testfiles/ccx/spine_points.csv b/src/Mod/Fem/femtest/data/ccx/spine_points.csv similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/spine_points.csv rename to src/Mod/Fem/femtest/data/ccx/spine_points.csv diff --git a/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.FCStd b/src/Mod/Fem/femtest/data/ccx/spine_thermomech.FCStd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.FCStd rename to src/Mod/Fem/femtest/data/ccx/spine_thermomech.FCStd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.dat b/src/Mod/Fem/femtest/data/ccx/spine_thermomech.dat similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.dat rename to src/Mod/Fem/femtest/data/ccx/spine_thermomech.dat diff --git a/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.frd b/src/Mod/Fem/femtest/data/ccx/spine_thermomech.frd similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.frd rename to src/Mod/Fem/femtest/data/ccx/spine_thermomech.frd diff --git a/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.inp b/src/Mod/Fem/femtest/data/ccx/spine_thermomech.inp similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech.inp rename to src/Mod/Fem/femtest/data/ccx/spine_thermomech.inp diff --git a/src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech_expected_values b/src/Mod/Fem/femtest/data/ccx/spine_thermomech_expected_values similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/spine_thermomech_expected_values rename to src/Mod/Fem/femtest/data/ccx/spine_thermomech_expected_values diff --git a/src/Mod/Fem/femtest/testfiles/ccx/spine_volumes.csv b/src/Mod/Fem/femtest/data/ccx/spine_volumes.csv similarity index 100% rename from src/Mod/Fem/femtest/testfiles/ccx/spine_volumes.csv rename to src/Mod/Fem/femtest/data/ccx/spine_volumes.csv diff --git a/src/Mod/Fem/femtest/testfiles/elmer/ELMERSOLVER_STARTINFO b/src/Mod/Fem/femtest/data/elmer/ELMERSOLVER_STARTINFO similarity index 100% rename from src/Mod/Fem/femtest/testfiles/elmer/ELMERSOLVER_STARTINFO rename to src/Mod/Fem/femtest/data/elmer/ELMERSOLVER_STARTINFO diff --git a/src/Mod/Fem/femtest/testfiles/mesh/__init__.py b/src/Mod/Fem/femtest/data/elmer/__init__.py similarity index 100% rename from src/Mod/Fem/femtest/testfiles/mesh/__init__.py rename to src/Mod/Fem/femtest/data/elmer/__init__.py diff --git a/src/Mod/Fem/femtest/testfiles/elmer/case.sif b/src/Mod/Fem/femtest/data/elmer/case.sif similarity index 100% rename from src/Mod/Fem/femtest/testfiles/elmer/case.sif rename to src/Mod/Fem/femtest/data/elmer/case.sif diff --git a/src/Mod/Fem/femtest/testfiles/elmer/group_mesh.geo b/src/Mod/Fem/femtest/data/elmer/group_mesh.geo similarity index 100% rename from src/Mod/Fem/femtest/testfiles/elmer/group_mesh.geo rename to src/Mod/Fem/femtest/data/elmer/group_mesh.geo diff --git a/src/Mod/Fem/femtest/data/mesh/__init__.py b/src/Mod/Fem/femtest/data/mesh/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.inp b/src/Mod/Fem/femtest/data/mesh/tetra10_mesh.inp similarity index 100% rename from src/Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.inp rename to src/Mod/Fem/femtest/data/mesh/tetra10_mesh.inp diff --git a/src/Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.unv b/src/Mod/Fem/femtest/data/mesh/tetra10_mesh.unv similarity index 100% rename from src/Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.unv rename to src/Mod/Fem/femtest/data/mesh/tetra10_mesh.unv diff --git a/src/Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.vtk b/src/Mod/Fem/femtest/data/mesh/tetra10_mesh.vtk similarity index 100% rename from src/Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.vtk rename to src/Mod/Fem/femtest/data/mesh/tetra10_mesh.vtk diff --git a/src/Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.yml b/src/Mod/Fem/femtest/data/mesh/tetra10_mesh.yml similarity index 100% rename from src/Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.yml rename to src/Mod/Fem/femtest/data/mesh/tetra10_mesh.yml diff --git a/src/Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.z88 b/src/Mod/Fem/femtest/data/mesh/tetra10_mesh.z88 similarity index 100% rename from src/Mod/Fem/femtest/testfiles/mesh/tetra10_mesh.z88 rename to src/Mod/Fem/femtest/data/mesh/tetra10_mesh.z88