From bfdb124dca39f460ff8ea851ad6fe9da1adceb84 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Sun, 19 Jan 2020 13:39:28 +0100 Subject: [PATCH] FEM: ccx unit tests, sort methods by abc --- src/Mod/Fem/TestFem.py | 20 ++-- src/Mod/Fem/femtest/app/test_ccxtools.py | 118 +++++++++++------------ 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py index a631a8db01..9cec472e1c 100644 --- a/src/Mod/Fem/TestFem.py +++ b/src/Mod/Fem/TestFem.py @@ -123,13 +123,13 @@ from femtest.utilstest import get_fem_test_defs as gf gf() ./bin/FreeCADCmd --run-test "femtest.app.test_femimport.TestObjectExistance.test_objects_existance" +./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_freq_analysis" ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_analysis" +./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_contact_shell_shell" ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_material_multiple" ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_material_nonlinar" -./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_freq_analysis" -./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_thermomech_spine_analysis" ./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_thermomech_flow1D_analysis" -./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_contact_shell_shell" +./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_thermomech_spine_analysis" ./bin/FreeCADCmd --run-test "femtest.app.test_common.TestFemCommon.test_adding_refshaps" ./bin/FreeCADCmd --run-test "femtest.app.test_common.TestFemCommon.test_pyimport_all_FEM_modules" ./bin/FreeCADCmd --run-test "femtest.app.test_material.TestMaterialUnits.test_known_quantity_units" @@ -164,26 +164,26 @@ gf() from femtest.utilstest import get_fem_test_defs as gf gf("in") +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_contact_shell_shell")) + 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_freq_analysis")) - -import unittest -unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_ccxtools.TestCcxTools.test_thermomech_spine_analysis")) - 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_static_contact_shell_shell")) +unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_ccxtools.TestCcxTools.test_thermomech_spine_analysis")) import unittest unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_common.TestFemCommon.test_adding_refshaps")) diff --git a/src/Mod/Fem/femtest/app/test_ccxtools.py b/src/Mod/Fem/femtest/app/test_ccxtools.py index 6e419477af..c72e020049 100644 --- a/src/Mod/Fem/femtest/app/test_ccxtools.py +++ b/src/Mod/Fem/femtest/app/test_ccxtools.py @@ -67,6 +67,38 @@ class TestCcxTools(unittest.TestCase): 62 * "*" )) + # ******************************************************************************************** + def test_freq_analysis( + self + ): + # set up + from femexamples.boxanalysis import setup_frequency as setup + setup(self.active_doc, "ccxtools") + test_name = "frequency" + base_name = "cube_frequency" + res_obj_name = "CCX_Mode1_Results" + analysis_dir = testtools.get_unit_test_tmp_dir( + self.temp_dir, + "FEM_ccx_frequency" + ) + + # test input file writing + fea = self.input_file_writing_test( + test_name=test_name, + base_name=base_name, + analysis_dir=analysis_dir, + test_end=True, + ) + + # test result reading + self.result_reading_test( + test_name=test_name, + base_name=base_name, + analysis_dir=analysis_dir, + fea=fea, + res_obj_name=res_obj_name, + ) + # ******************************************************************************************** def test_static_analysis( self @@ -99,6 +131,27 @@ class TestCcxTools(unittest.TestCase): res_obj_name=res_obj_name, ) + # ******************************************************************************************** + def test_static_contact_shell_shell( + self + ): + # set up + from femexamples.contact_shell_shell import setup + setup(self.active_doc, "ccxtools") + test_name = "contact shell shell" + base_name = "contact_shell_shell" + analysis_dir = testtools.get_unit_test_tmp_dir( + self.temp_dir, + "FEM_ccx_contact_shell_shell", + ) + + # test input file writing + self.input_file_writing_test( + test_name=test_name, + base_name=base_name, + analysis_dir=analysis_dir, + ) + # ******************************************************************************************** def test_static_material_multiple( self @@ -142,18 +195,18 @@ class TestCcxTools(unittest.TestCase): ) # ******************************************************************************************** - def test_freq_analysis( + def test_thermomech_flow1D_analysis( self ): # set up - from femexamples.boxanalysis import setup_frequency as setup + from femexamples.thermomech_flow1d import setup setup(self.active_doc, "ccxtools") - test_name = "frequency" - base_name = "cube_frequency" - res_obj_name = "CCX_Mode1_Results" + test_name = "Flow1D" + base_name = "Flow1D_thermomech" + res_obj_name = "CCX_Time1_0_Results" analysis_dir = testtools.get_unit_test_tmp_dir( self.temp_dir, - "FEM_ccx_frequency" + "FEM_ccx_Flow1D_thermomech" ) # test input file writing @@ -205,59 +258,6 @@ class TestCcxTools(unittest.TestCase): res_obj_name=res_obj_name, ) - # ******************************************************************************************** - def test_thermomech_flow1D_analysis( - self - ): - # set up - from femexamples.thermomech_flow1d import setup - setup(self.active_doc, "ccxtools") - test_name = "Flow1D" - base_name = "Flow1D_thermomech" - res_obj_name = "CCX_Time1_0_Results" - analysis_dir = testtools.get_unit_test_tmp_dir( - self.temp_dir, - "FEM_ccx_Flow1D_thermomech" - ) - - # test input file writing - fea = self.input_file_writing_test( - test_name=test_name, - base_name=base_name, - analysis_dir=analysis_dir, - test_end=True, - ) - - # test result reading - self.result_reading_test( - test_name=test_name, - base_name=base_name, - analysis_dir=analysis_dir, - fea=fea, - res_obj_name=res_obj_name, - ) - - # ******************************************************************************************** - def test_static_contact_shell_shell( - self - ): - # set up - from femexamples.contact_shell_shell import setup - setup(self.active_doc, "ccxtools") - test_name = "contact shell shell" - base_name = "contact_shell_shell" - analysis_dir = testtools.get_unit_test_tmp_dir( - self.temp_dir, - "FEM_ccx_contact_shell_shell", - ) - - # test input file writing - self.input_file_writing_test( - test_name=test_name, - base_name=base_name, - analysis_dir=analysis_dir, - ) - # ******************************************************************************************** def input_file_writing_test( self,