From 5948a830588e3224de4d5093d5cf0c6e4cea91a0 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 23 Jun 2020 09:01:32 +0200 Subject: [PATCH] FEM: unit test, fix setting up some examples --- src/Mod/Fem/femtest/app/test_ccxtools.py | 6 +++--- src/Mod/Fem/femtest/app/test_solverframework.py | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Mod/Fem/femtest/app/test_ccxtools.py b/src/Mod/Fem/femtest/app/test_ccxtools.py index 5f7892def0..fd7826c405 100644 --- a/src/Mod/Fem/femtest/app/test_ccxtools.py +++ b/src/Mod/Fem/femtest/app/test_ccxtools.py @@ -82,7 +82,7 @@ class TestCcxTools(unittest.TestCase): self ): # set up - from femexamples.boxanalysis import setup_frequency as setup + from femexamples.boxanalysis_frequency import setup setup(self.document, "ccxtools") test_name = "frequency" base_name = "cube_frequency" @@ -114,7 +114,7 @@ class TestCcxTools(unittest.TestCase): self ): # set up - from femexamples.boxanalysis import setup_static as setup + from femexamples.boxanalysis_static import setup setup(self.document, "ccxtools") test_name = "ccxtools static" base_name = "cube_static" @@ -146,7 +146,7 @@ class TestCcxTools(unittest.TestCase): self ): # set up - from femexamples.ccx_cantilever_std import setup_cantileverhexa20faceload as setup + from femexamples.ccx_cantilever_hexa20faceload import setup setup(self.document, "ccxtools") test_name = "canti ccx faceload hexa20" base_name = "canti_ccx_faceload_hexa20" diff --git a/src/Mod/Fem/femtest/app/test_solverframework.py b/src/Mod/Fem/femtest/app/test_solverframework.py index 88b933941b..9237e99eac 100644 --- a/src/Mod/Fem/femtest/app/test_solverframework.py +++ b/src/Mod/Fem/femtest/app/test_solverframework.py @@ -82,8 +82,8 @@ class TestSolverFrameWork(unittest.TestCase): fcc_print("\n--------------- Start of FEM tests solver framework solver CalculiX ------") # set up the CalculiX static analysis example - from femexamples import boxanalysis as box - box.setup_static(self.document, "calculix") + from femexamples.boxanalysis_static import setup + setup(self.document, "calculix") solver_obj = self.document.SolverCalculiX @@ -124,8 +124,8 @@ class TestSolverFrameWork(unittest.TestCase): fcc_print("\n--------------- Start of FEM tests solver framework solver Elmer ---------") # set up the Elmer static analysis example - from femexamples import boxanalysis as box - box.setup_static(self.document, "elmer") + from femexamples.boxanalysis_static import setup + setup(self.document, "elmer") analysis_obj = self.document.Analysis solver_obj = self.document.SolverElmer