diff --git a/src/Mod/Fem/femtest/app/support_utils.py b/src/Mod/Fem/femtest/app/support_utils.py index beca8a7860..2c4c7fbffb 100644 --- a/src/Mod/Fem/femtest/app/support_utils.py +++ b/src/Mod/Fem/femtest/app/support_utils.py @@ -120,36 +120,49 @@ def get_fem_test_defs( if ln.startswith("def test"): ln = ln.lstrip("def ") ln = ln.split("(")[0] + if ln == "test_00print": + continue method_path = "femtest.app.{}.{}.{}".format(module_name, class_name, ln) collected_test_methods.append(method_path) tfile.close() - # output prints - print("") - print("") - print("# modules") + # write to file + file_path = join(tempfile.gettempdir(), "test_commands.sh") + cf = open(file_path, "w") + cf.write("# created by Python\n") + cf.write("'''\n") + cf.write("from femtest.app.support_utils import get_fem_test_defs\n") + cf.write("get_fem_test_defs()\n") + cf.write("\n") + cf.write("\n") + cf.write("'''\n") + cf.write("\n") + cf.write("# modules\n") for m in collected_test_modules: - print("make -j 4 && ./bin/FreeCADCmd -t {}".format(m)) - print("") - print("") - print("# classes") + cf.write("make -j 4 && ./bin/FreeCADCmd -t {}\n".format(m)) + cf.write("\n") + cf.write("\n") + cf.write("# classes\n") for m in collected_test_classes: - print("make -j 4 && ./bin/FreeCADCmd -t {}".format(m)) - print("") - print("") - print("# methods") + cf.write("make -j 4 && ./bin/FreeCADCmd -t {}\n".format(m)) + cf.write("\n") + cf.write("\n") + cf.write("# methods\n") for m in collected_test_methods: - print("make -j 4 && ./bin/FreeCADCmd -t {}".format(m)) - print("") - print("") - print("# methods in FreeCAD") + cf.write("make -j 4 && ./bin/FreeCADCmd -t {}\n".format(m)) + cf.write("\n") + cf.write("\n") + cf.write("# methods in FreeCAD\n") for m in collected_test_methods: - print( + cf.write( + "\nimport unittest\n" "unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName(\n" " '{}'\n" "))\n" .format(m) ) + cf.close() + print("The file was saved in:{}".format(file_path)) def compare_inp_files( diff --git a/src/Mod/Fem/test_commands.sh b/src/Mod/Fem/test_commands.sh index a9ce95347e..190d88a268 100644 --- a/src/Mod/Fem/test_commands.sh +++ b/src/Mod/Fem/test_commands.sh @@ -1,3 +1,11 @@ +# created by Python +''' +from femtest.app.support_utils import get_fem_test_defs +get_fem_test_defs() + + +''' + # modules make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_common @@ -26,7 +34,6 @@ make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solverframework.TestSolverFram # methods -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_freq_analysis make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_static_analysis make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_static_constraint_force_faceload_hexa20 @@ -38,263 +45,247 @@ make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_sta make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_thermomech_bimetall make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_thermomech_flow1D_analysis make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_ccxtools.TestCcxTools.test_thermomech_spine_analysis -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_common.TestFemCommon.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_common.TestFemCommon.test_adding_refshaps make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_common.TestFemCommon.test_pyimport_all_FEM_modules -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_femimport.TestFemImport.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_femimport.TestFemImport.test_import_fem -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_femimport.TestObjectExistance.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_femimport.TestObjectExistance.test_objects_existance -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_material.TestMaterialUnits.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_material.TestMaterialUnits.test_known_quantity_units make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_material.TestMaterialUnits.test_material_card_quantities -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshCommon.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshCommon.test_mesh_seg2_python make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshCommon.test_mesh_seg3_python make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshCommon.test_unv_save_load make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshCommon.test_writeAbaqus_precision -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshEleTetra10.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_create make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_inp make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_unv make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_vkt make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_yml make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_z88 -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_object.TestObjectCreate.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_object.TestObjectCreate.test_femobjects_make -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_object.TestObjectType.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_object.TestObjectType.test_femobjects_type make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_object.TestObjectType.test_femobjects_isoftype make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_object.TestObjectType.test_femobjects_derivedfromfem make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_object.TestObjectType.test_femobjects_derivedfromstd -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_open.TestObjectOpen.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_open.TestObjectOpen.test_femobjects_open_head make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_open.TestObjectOpen.test_femobjects_open_de9b3fb438 -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_result.TestResult.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_result.TestResult.test_read_frd_massflow_networkpressure make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_result.TestResult.test_stress_von_mises make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_result.TestResult.test_stress_principal_std make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_result.TestResult.test_stress_principal_reinforced make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_result.TestResult.test_rho make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_result.TestResult.test_disp_abs -make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solverframework.TestSolverFrameWork.test_00print make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solverframework.TestSolverFrameWork.test_solver_calculix make -j 4 && ./bin/FreeCADCmd -t femtest.app.test_solverframework.TestSolverFrameWork.test_solver_elmer # methods in FreeCAD -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_ccxtools.TestCcxTools.test_00print' -)) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_ccxtools.TestCcxTools.test_freq_analysis' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_ccxtools.TestCcxTools.test_static_analysis' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_ccxtools.TestCcxTools.test_static_constraint_force_faceload_hexa20' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_ccxtools.TestCcxTools.test_static_constraint_contact_shell_shell' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_ccxtools.TestCcxTools.test_static_constraint_contact_solid_solid' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_ccxtools.TestCcxTools.test_static_constraint_tie' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_ccxtools.TestCcxTools.test_static_material_multiple' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_ccxtools.TestCcxTools.test_static_material_nonlinar' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_ccxtools.TestCcxTools.test_thermomech_bimetall' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_ccxtools.TestCcxTools.test_thermomech_flow1D_analysis' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_ccxtools.TestCcxTools.test_thermomech_spine_analysis' )) -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_common.TestFemCommon.test_00print' -)) - +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_common.TestFemCommon.test_adding_refshaps' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_common.TestFemCommon.test_pyimport_all_FEM_modules' )) -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_femimport.TestFemImport.test_00print' -)) - +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_femimport.TestFemImport.test_import_fem' )) -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_femimport.TestObjectExistance.test_00print' -)) - +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_femimport.TestObjectExistance.test_objects_existance' )) -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_material.TestMaterialUnits.test_00print' -)) - +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_material.TestMaterialUnits.test_known_quantity_units' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_material.TestMaterialUnits.test_material_card_quantities' )) -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_mesh.TestMeshCommon.test_00print' -)) - +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_mesh.TestMeshCommon.test_mesh_seg2_python' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_mesh.TestMeshCommon.test_mesh_seg3_python' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_mesh.TestMeshCommon.test_unv_save_load' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_mesh.TestMeshCommon.test_writeAbaqus_precision' )) -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_mesh.TestMeshEleTetra10.test_00print' -)) - +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_create' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_inp' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_unv' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_vkt' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_yml' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_mesh.TestMeshEleTetra10.test_tetra10_z88' )) -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_object.TestObjectCreate.test_00print' -)) - +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_object.TestObjectCreate.test_femobjects_make' )) -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_object.TestObjectType.test_00print' -)) - +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_object.TestObjectType.test_femobjects_type' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_object.TestObjectType.test_femobjects_isoftype' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_object.TestObjectType.test_femobjects_derivedfromfem' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_object.TestObjectType.test_femobjects_derivedfromstd' )) -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_open.TestObjectOpen.test_00print' -)) - +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_open.TestObjectOpen.test_femobjects_open_head' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_open.TestObjectOpen.test_femobjects_open_de9b3fb438' )) -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_result.TestResult.test_00print' -)) - +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_result.TestResult.test_read_frd_massflow_networkpressure' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_result.TestResult.test_stress_von_mises' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_result.TestResult.test_stress_principal_std' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_result.TestResult.test_stress_principal_reinforced' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_result.TestResult.test_rho' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_result.TestResult.test_disp_abs' )) -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( - 'femtest.app.test_solverframework.TestSolverFrameWork.test_00print' -)) - +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_solverframework.TestSolverFrameWork.test_solver_calculix' )) +import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName( 'femtest.app.test_solverframework.TestSolverFrameWork.test_solver_elmer' ))