Fem: Update Elmer test files

src/Mod/Fem/femtest/app/test_open.py

@@ -259,9 +259,9 @@ class TestObjectOpen(unittest.TestCase):
 
         self.assertEqual(SolverCcxTools, doc.SolverCcxTools.Proxy.__class__)
 
-        from femsolver.elmer.solver import Proxy
+        from femobjects.solver_elmer import SolverElmer
 
-        self.assertEqual(Proxy, doc.SolverElmer.Proxy.__class__)
+        self.assertEqual(SolverElmer, doc.SolverElmer.Proxy.__class__)
 
         from femsolver.z88.solver import Proxy
 

src/Mod/Fem/femtest/app/test_solver_elmer.py

@@ -30,7 +30,7 @@ from os.path import join
 
 import FreeCAD
 
-import femsolver.run
+from femsolver.elmer import writer
 from . import support_utils as testtools
 from .support_utils import fcc_print
 from .support_utils import get_namefromdef
@@ -118,12 +118,8 @@ class TestSolverElmer(unittest.TestCase):
 
         # write input files
         # fcc_print("Checking FEM input file writing for Elmer solver framework solver ...")
-        machine_elmer = self.document.SolverElmer.Proxy.createMachine(
-            self.document.SolverElmer, analysis_dir, True
-        )
-        machine_elmer.target = femsolver.run.PREPARE
-        machine_elmer.start()
-        machine_elmer.join()  # wait for the machine to finish.
+        w = writer.Writer(self.document.SolverElmer, analysis_dir)
+        w.write_solver_input()
 
         fcc_print("Test writing STARTINFO file")
         startinfo_given = join(self.test_file_dir, "ELMERSOLVER_STARTINFO")
@@ -139,13 +135,6 @@ class TestSolverElmer(unittest.TestCase):
         ret = testtools.compare_files(casefile_given, casefile_totest)
         self.assertFalse(ret, f"case write file test failed.\n{ret}")
 
-        fcc_print("Test writing GMSH geo file")
-        gmshgeofile_given = join(self.test_file_dir, "group_mesh.geo")
-        gmshgeofile_totest = join(analysis_dir, "group_mesh.geo")
-        # fcc_print("Comparing {} to {}".format(gmshgeofile_given, gmshgeofile_totest))
-        ret = testtools.compare_files(gmshgeofile_given, gmshgeofile_totest)
-        self.assertFalse(ret, f"GMSH geo write file test failed.\n{ret}")
-
     # ********************************************************************************************
     def test_ccxcantilever_faceload_0_mm(self):
         fcc_print("")
@@ -193,12 +182,8 @@ class TestSolverElmer(unittest.TestCase):
         self.document.saveAs(save_fc_file)
 
         # write input file
-        machine = self.document.SolverElmer.Proxy.createMachine(
-            self.document.SolverElmer, working_dir, True  # set testmode to True
-        )
-        machine.target = femsolver.run.PREPARE
-        machine.start()
-        machine.join()  # wait for the machine to finish
+        w = writer.Writer(self.document.SolverElmer, working_dir)
+        w.write_solver_input()
 
         # compare input file with the given one
         inpfile_given = join(self.test_file_dir, base_name + self.ending)