Merge pull request #165 from alxbilger/test

Fix tests compilation with respect to SOFA
sofa-framework · Jan 22, 2025 · 62bc9d3 · 62bc9d3
2 parents fc0fc05 + e66722d
commit 62bc9d3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/BeamAdapter_test/BeamInterpolation_test.cpp b/BeamAdapter_test/BeamInterpolation_test.cpp
@@ -63,12 +63,12 @@ namespace sofa
 struct BeamInterpolationTest : public  sofa::testing::BaseSimulationTest,
         public ::testing::WithParamInterface<std::vector<std::string>>
 {
-    void SetUp() override
+    void doSetUp() override
     {
-        sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Backward");
-        sofa::simpleapi::importPlugin("Sofa.Component.LinearSolver.Iterative");
-        sofa::simpleapi::importPlugin("Sofa.Component.StateContainer");
-        sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Constant");
+        sofa::simpleapi::importPlugin(Sofa.Component.ODESolver.Backward);
+        sofa::simpleapi::importPlugin(Sofa.Component.LinearSolver.Iterative);
+        sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
+        sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Constant);
         sofa::simpleapi::importPlugin("BeamAdapter");
     }
 

diff --git a/BeamAdapter_test/component/controller/InterventionalRadiologyController_test.cpp b/BeamAdapter_test/component/controller/InterventionalRadiologyController_test.cpp
@@ -46,13 +46,13 @@ class InterventionalRadiologyController_test : public BaseTest
     typedef typename Coord::value_type   Real;
     //typedef typename sofa::defaulttype::SolidTypes<Real>::Transform Transform;
 
-    void onSetUp() override
+    void doSetUp() override
     {
         sofa::simpleapi::importPlugin("BeamAdapter");
-        sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic");
-        sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Grid");
-        sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Projective");
-        sofa::simpleapi::importPlugin("Sofa.Component.StateContainer");
+        sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic);
+        sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid);
+        sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Projective);
+        sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
 
         m_root = sofa::simpleapi::createRootNode(sofa::simulation::getSimulation(), "root");
     }

diff --git a/BeamAdapter_test/component/mapping/BeamProjectionDifferenceMultiMappingTest.cpp b/BeamAdapter_test/component/mapping/BeamProjectionDifferenceMultiMappingTest.cpp
@@ -65,12 +65,6 @@ struct BeamProjectionDifferenceMultiMappingTest : public sofa::Multi2Mapping_tes
     typedef typename In2DataTypes::VecCoord In2VecCoord;
     typedef typename OutDataTypes::VecCoord OutVecCoord;
 
-
-    void SetUp() override
-    {
-    }
-
-
     BeamProjectionDifferenceMultiMapping* m_mapping;
     sofa::component::fem::BeamInterpolation<sofa::defaulttype::Rigid3Types>* m_interpolation;
     sofa::component::topology::container::constant::MeshTopology* m_topology;