From 6acb3bda919b7e8714fae5c44a8be6e9b4fe6977 Mon Sep 17 00:00:00 2001 From: marioalexis Date: Thu, 3 Apr 2025 03:20:19 -0300 Subject: [PATCH] Fem: Update test --- src/Mod/Fem/femtest/app/test_object.py | 14 +++++++------- src/Mod/Fem/femtest/app/test_open.py | 4 ---- src/Mod/Fem/femtest/gui/test_open.py | 4 ---- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/Mod/Fem/femtest/app/test_object.py b/src/Mod/Fem/femtest/app/test_object.py index cbd67e9c84..cf9ed123ac 100644 --- a/src/Mod/Fem/femtest/app/test_object.py +++ b/src/Mod/Fem/femtest/app/test_object.py @@ -254,7 +254,7 @@ class TestObjectType(unittest.TestCase): self.assertEqual( "Fem::SolverCcxTools", type_of_obj(ObjectsFem.makeSolverCalculiXCcxTools(doc)) ) - self.assertEqual("Fem::SolverCalculix", type_of_obj(ObjectsFem.makeSolverCalculix(doc))) + self.assertEqual("Fem::SolverCalculiX", type_of_obj(ObjectsFem.makeSolverCalculiX(doc))) self.assertEqual("Fem::SolverElmer", type_of_obj(solverelmer)) self.assertEqual("Fem::SolverMystran", type_of_obj(ObjectsFem.makeSolverMystran(doc))) self.assertEqual("Fem::SolverZ88", type_of_obj(ObjectsFem.makeSolverZ88(doc))) @@ -434,7 +434,7 @@ class TestObjectType(unittest.TestCase): self.assertTrue( is_of_type(ObjectsFem.makeSolverCalculiXCcxTools(doc), "Fem::SolverCcxTools") ) - self.assertTrue(is_of_type(ObjectsFem.makeSolverCalculix(doc), "Fem::SolverCalculix")) + self.assertTrue(is_of_type(ObjectsFem.makeSolverCalculiX(doc), "Fem::SolverCalculiX")) self.assertTrue(is_of_type(solverelmer, "Fem::SolverElmer")) self.assertTrue(is_of_type(ObjectsFem.makeSolverMystran(doc), "Fem::SolverMystran")) self.assertTrue(is_of_type(ObjectsFem.makeSolverZ88(doc), "Fem::SolverZ88")) @@ -805,12 +805,12 @@ class TestObjectType(unittest.TestCase): self.assertTrue(is_derived_from(solver_ccxtools, "Fem::FemSolverObjectPython")) self.assertTrue(is_derived_from(solver_ccxtools, "Fem::SolverCcxTools")) - # SolverCalculix - solver_calculix = ObjectsFem.makeSolverCalculix(doc) + # SolverCalculiX + solver_calculix = ObjectsFem.makeSolverCalculiX(doc) self.assertTrue(is_derived_from(solver_calculix, "App::DocumentObject")) self.assertTrue(is_derived_from(solver_calculix, "Fem::FemSolverObject")) self.assertTrue(is_derived_from(solver_calculix, "Fem::FemSolverObjectPython")) - self.assertTrue(is_derived_from(solver_calculix, "Fem::SolverCalculix")) + self.assertTrue(is_derived_from(solver_calculix, "Fem::SolverCalculiX")) # SolverElmer solver_elmer = ObjectsFem.makeSolverElmer(doc) @@ -1036,7 +1036,7 @@ class TestObjectType(unittest.TestCase): ObjectsFem.makeSolverCalculiXCcxTools(doc).isDerivedFrom("Fem::FemSolverObjectPython") ) self.assertTrue( - ObjectsFem.makeSolverCalculix(doc).isDerivedFrom("Fem::FemSolverObjectPython") + ObjectsFem.makeSolverCalculiX(doc).isDerivedFrom("Fem::FemSolverObjectPython") ) self.assertTrue(solverelmer.isDerivedFrom("Fem::FemSolverObjectPython")) self.assertTrue( @@ -1156,7 +1156,7 @@ def create_all_fem_objects_doc(doc): ObjectsFem.makePostVtkFilterContours(doc, vres) analysis.addObject(ObjectsFem.makeSolverCalculiXCcxTools(doc)) - analysis.addObject(ObjectsFem.makeSolverCalculix(doc)) + analysis.addObject(ObjectsFem.makeSolverCalculiX(doc)) sol = analysis.addObject(ObjectsFem.makeSolverElmer(doc))[0] analysis.addObject(ObjectsFem.makeSolverMystran(doc)) analysis.addObject(ObjectsFem.makeSolverZ88(doc)) diff --git a/src/Mod/Fem/femtest/app/test_open.py b/src/Mod/Fem/femtest/app/test_open.py index 28928b01dc..3c6a84b6fb 100644 --- a/src/Mod/Fem/femtest/app/test_open.py +++ b/src/Mod/Fem/femtest/app/test_open.py @@ -259,10 +259,6 @@ class TestObjectOpen(unittest.TestCase): self.assertEqual(SolverCcxTools, doc.SolverCcxTools.Proxy.__class__) - from femsolver.calculix.solver import Proxy - - self.assertEqual(Proxy, doc.SolverCalculix.Proxy.__class__) - from femsolver.elmer.solver import Proxy self.assertEqual(Proxy, doc.SolverElmer.Proxy.__class__) diff --git a/src/Mod/Fem/femtest/gui/test_open.py b/src/Mod/Fem/femtest/gui/test_open.py index 8fea41e71b..d84f716645 100644 --- a/src/Mod/Fem/femtest/gui/test_open.py +++ b/src/Mod/Fem/femtest/gui/test_open.py @@ -243,10 +243,6 @@ class TestObjectOpen(unittest.TestCase): self.assertEqual(VPSolverCcxTools, doc.SolverCcxTools.ViewObject.Proxy.__class__) - from femsolver.calculix.solver import ViewProxy - - self.assertEqual(ViewProxy, doc.SolverCalculix.ViewObject.Proxy.__class__) - from femsolver.elmer.solver import ViewProxy self.assertEqual(ViewProxy, doc.SolverElmer.ViewObject.Proxy.__class__)