Skip to content

Commit

Permalink
FEM: ccx unit tests, remove numbers from test names
Browse files Browse the repository at this point in the history
  • Loading branch information
berndhahnebach committed Jan 19, 2020
1 parent 785e4b1 commit 4c786b5
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 21 deletions.
28 changes: 14 additions & 14 deletions src/Mod/Fem/TestFem.py
Expand Up @@ -123,13 +123,13 @@
gf()
./bin/FreeCADCmd --run-test "femtest.app.test_femimport.TestObjectExistance.test_objects_existance"
./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_1_static_analysis"
./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_2_static_material_multiple"
./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_3_static_material_nonlinar"
./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_4_freq_analysis"
./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_5_thermomech_analysis"
./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_6_Flow1D_thermomech_analysis"
./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_7_contact_shell_shell"
./bin/FreeCADCmd --run-test "femtest.app.test_ccxtools.TestCcxTools.test_static_analysis"
./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_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"
Expand Down Expand Up @@ -165,25 +165,25 @@
gf("in")
import unittest
unittest.TextTestRunner().run(unittest.TestLoader().loadTestsFromName("femtest.app.test_ccxtools.TestCcxTools.test_1_static_analysis"))
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_2_static_material_multiple"))
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_3_static_material_nonlinar"))
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_4_freq_analysis"))
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_5_thermomech_analysis"))
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_6_Flow1D_thermomech_analysis"))
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_7_contact_shell_shell"))
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_common.TestFemCommon.test_adding_refshaps"))
Expand Down
14 changes: 7 additions & 7 deletions src/Mod/Fem/femtest/app/test_ccxtools.py
Expand Up @@ -68,7 +68,7 @@ def test_00print(
))

# ********************************************************************************************
def test_1_static_analysis(
def test_static_analysis(
self
):
# set up
Expand Down Expand Up @@ -100,7 +100,7 @@ def test_1_static_analysis(
)

# ********************************************************************************************
def test_2_static_material_multiple(
def test_static_material_multiple(
self
):
# set up
Expand All @@ -121,7 +121,7 @@ def test_2_static_material_multiple(
)

# ********************************************************************************************
def test_3_static_material_nonlinar(
def test_static_material_nonlinar(
self
):
# set up
Expand All @@ -142,7 +142,7 @@ def test_3_static_material_nonlinar(
)

# ********************************************************************************************
def test_4_freq_analysis(
def test_freq_analysis(
self
):
# set up
Expand Down Expand Up @@ -174,7 +174,7 @@ def test_4_freq_analysis(
)

# ********************************************************************************************
def test_5_thermomech_analysis(
def test_thermomech_spine_analysis(
self
):
# set up
Expand Down Expand Up @@ -206,7 +206,7 @@ def test_5_thermomech_analysis(
)

# ********************************************************************************************
def test_6_Flow1D_thermomech_analysis(
def test_thermomech_flow1D_analysis(
self
):
# set up
Expand Down Expand Up @@ -238,7 +238,7 @@ def test_6_Flow1D_thermomech_analysis(
)

# ********************************************************************************************
def test_7_contact_shell_shell(
def test_static_contact_shell_shell(
self
):
# set up
Expand Down

0 comments on commit 4c786b5

Please sign in to comment.