From fe39f310e41790fbde103dca4ae285f270e62461 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Wed, 7 Feb 2018 20:41:46 +0100 Subject: [PATCH] FEM: unit tests, add some example code to run FEM unit tests --- src/Mod/Fem/TestFem.py | 46 ++++++++++++++++++++++++++++++++ src/Mod/Fem/femtest/testtools.py | 15 ----------- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFem.py index d97cbbd8e0..ebf703436d 100644 --- a/src/Mod/Fem/TestFem.py +++ b/src/Mod/Fem/TestFem.py @@ -30,3 +30,49 @@ from femtest.testcommon import FemTest from femtest.testccxtools import FemCcxAnalysisTest from femtest.testsolverframework import SolverFrameWorkTest + + +''' +for more information on how to run a specific test class or a test def see +file src/Mod/Test/__init__ +https://forum.freecadweb.org/viewtopic.php?f=10&t=22190#p175546 + + + +examples from within FreeCAD: + +import Test, TestFem +Test.runTestsFromModule(TestFem) + +import Test, femtest.testcommon +Test.runTestsFromModule(femtest.testcommon) + +import Test, TestFem +Test.runTestsFromClass(TestFem.FemTest) + +import Test, femtest.testcommon +Test.runTestsFromClass(femtest.testcommon.FemTest) + + +import unittest +mytest = unittest.TestLoader().loadTestsFromName("TestFem.FemTest.test_pyimport_all_FEM_modules") +unittest.TextTestRunner().run(mytest) + + + + +examples from shell in build dir: + +./bin/FreeCAD --run-test "TestFem" + +./bin/FreeCAD --run-test "TestFem.FemTest" + +./bin/FreeCAD --run-test "TestFem.FemTest.test_pyimport_all_FEM_modules" + + + + +to run all FreeCAD tests from shell: + +./bin/FreeCAD --run-test 0 +''' diff --git a/src/Mod/Fem/femtest/testtools.py b/src/Mod/Fem/femtest/testtools.py index a55ed0ecbf..1d39497862 100644 --- a/src/Mod/Fem/femtest/testtools.py +++ b/src/Mod/Fem/femtest/testtools.py @@ -168,18 +168,3 @@ def collect_python_modules(femsubdir=None): else: collected_modules.append(femsubdir.replace('/', '.') + '.' + os.path.splitext(os.path.basename(pyfile))[0]) return collected_modules - - -''' -for more information on how to run a specific test class or a test def see -file src/Mod/Test/__init__ -https://forum.freecadweb.org/viewtopic.php?f=10&t=22190#p175546 - -import unittest -mytest = unittest.TestLoader().loadTestsFromName("TestFem.FemTest.test_pyimport_all_FEM_modules") -unittest.TextTestRunner().run(mytest) - -import Test, TestFem -Test.runTestsFromModule(TestFem) - -'''