From 4c9c66015aa8108ed4ef5d5fee28af8e52f47b34 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Fri, 22 May 2020 15:55:56 +0200 Subject: [PATCH] FEM: unit tests, add app to test fem module name --- src/Mod/Fem/CMakeLists.txt | 2 +- src/Mod/Fem/Init.py | 4 ++-- src/Mod/Fem/{TestFem.py => TestFemApp.py} | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) rename src/Mod/Fem/{TestFem.py => TestFemApp.py} (99%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index bc7dc538d5..0faaa25201 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -31,7 +31,7 @@ SET(FemBaseModules_SRCS Init.py InitGui.py ObjectsFem.py - TestFem.py + TestFemApp.py ) SET(FemCommands_SRCS diff --git a/src/Mod/Fem/Init.py b/src/Mod/Fem/Init.py index 5f55ea4817..8382d82049 100644 --- a/src/Mod/Fem/Init.py +++ b/src/Mod/Fem/Init.py @@ -52,8 +52,8 @@ if sys.version_info.major >= 3: sys.meta_path.append(FemMigrateApp()) -# add FEM unit tests -FreeCAD.__unit_test__ += ["TestFem"] +# add FEM App unit tests +FreeCAD.__unit_test__ += ["TestFemApp"] # add import and export file types diff --git a/src/Mod/Fem/TestFem.py b/src/Mod/Fem/TestFemApp.py similarity index 99% rename from src/Mod/Fem/TestFem.py rename to src/Mod/Fem/TestFemApp.py index 26c68619f1..ef871908ab 100644 --- a/src/Mod/Fem/TestFem.py +++ b/src/Mod/Fem/TestFemApp.py @@ -66,8 +66,8 @@ import Test, femtest.app.test_object Test.runTestsFromClass(femtest.app.test_object.TestObjectCreate) # all FEM tests -import Test, TestFem -Test.runTestsFromModule(TestFem) +import Test, TestFemApp +Test.runTestsFromModule(TestFemApp) # module import Test, femtest.app.test_common @@ -90,8 +90,8 @@ unittest.TextTestRunner().run(alltest) ./bin/FreeCADCmd --run-test 0 # all FEM tests -./bin/FreeCAD --run-test "TestFem" -./bin/FreeCADCmd --run-test "TestFem" +./bin/FreeCAD --run-test "TestFemApp" +./bin/FreeCADCmd --run-test "TestFemApp" # import Fem and FemGui ./bin/FreeCAD --run-test "femtest.app.test_femimport"