Remove use of deprecated functions

SofaDefrost · Dec 18, 2023 · 91ea3b0 · 91ea3b0
1 parent d97cee8
commit 91ea3b0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 31 deletions.
diff --git a/tests/component/constraint/SurfacePressureConstraintTest.cpp b/tests/component/constraint/SurfacePressureConstraintTest.cpp
@@ -64,7 +64,6 @@ namespace softrobots {
         using SurfacePressureConstraint<_DataTypes>::d_componentState;
 
         sofa::simulation::Node::SPtr m_root;                 ///< Root of the scene graph, created by the constructor an re-used in the tests
-        sofa::simulation::Simulation* m_simulation;          ///< created by the constructor an re-used in the tests
 
         typedef _DataTypes DataTypes;
         typedef typename DataTypes::Deriv Deriv;
@@ -83,8 +82,6 @@ namespace softrobots {
         {
             sofa::simpleapi::importPlugin("Sofa.Component");
 
-            sofa::simulation::setSimulation(m_simulation = new sofa::simulation::graph::DAGSimulation());
-
             /// Load the scene
             string sceneName = "SurfacePressureConstraint.scn";
 

diff --git a/tests/component/constraint/UnilateralPlaneConstraintTest.cpp b/tests/component/constraint/UnilateralPlaneConstraintTest.cpp
@@ -88,11 +88,9 @@ struct UnilateralPlaneConstraintTest : public sofa::testing::BaseTest,
     /////////////////////////////////////////////////////////////////////
 
 
-    void normalTests(){
-        Simulation* simu;
-        setSimulation(simu = new sofa::simulation::graph::DAGSimulation());
-
-        Node::SPtr node = simu->createNewGraph("root");
+    void normalTests()
+    {
+        const Node::SPtr node = sofa::simulation::getSimulation()->createNewGraph("root");
         typename MechanicalObject<DataTypes>::SPtr mecaobject = New<MechanicalObject<DataTypes> >() ;
         typename ThisClass::SPtr thisobject = New<ThisClass >() ;
 

diff --git a/tests/component/controller/DataVariationLimiterTest.cpp b/tests/component/controller/DataVariationLimiterTest.cpp
@@ -72,13 +72,11 @@ struct DataVariationLimiterTest : public sofa::testing::BaseTest, DataVariationL
     ///////////////////////////////////////////////////////////////
 
 
-    Simulation* m_simu;
     Node::SPtr m_node;
 
     void SetUp()
     {
-        setSimulation(m_simu = new sofa::simulation::graph::DAGSimulation());
-        m_node = m_simu->createNewGraph("root");
+        m_node = sofa::simulation::getSimulation()->createNewGraph("root");
     }
 
     void normalTests(){

diff --git a/tests/component/controller/SerialPortBridgeGenericTest.cpp b/tests/component/controller/SerialPortBridgeGenericTest.cpp
@@ -80,13 +80,11 @@ struct SerialPortBridgeGenericTest : public sofa::testing::BaseTest, SerialPortB
     ///////////////////////////////////////////////////////////////
 
 
-    Simulation* m_simu;
     Node::SPtr m_node;
 
     void SetUp()
     {
-        setSimulation(m_simu = new sofa::simulation::graph::DAGSimulation());
-        m_node = m_simu->createNewGraph("root");
+        m_node = sofa::simulation::getSimulation()->createNewGraph("root");
     }
 
     void normalTests(){

diff --git a/tests/component/engine/VolumeFromTetrahedronsTest.cpp b/tests/component/engine/VolumeFromTetrahedronsTest.cpp
@@ -90,11 +90,9 @@ struct VolumeFromTetrahedronsTest : public sofa::testing::BaseTest, VolumeFromTe
     ///////////////////////////////////////////////////////////////
 
 
-    void normalTests(){
-        Simulation* simu;
-        setSimulation(simu = new sofa::simulation::graph::DAGSimulation());
-
-        Node::SPtr node = simu->createNewGraph("root");
+    void normalTests()
+    {
+        const Node::SPtr node = sofa::simulation::getSimulation()->createNewGraph("root");
         typename MechanicalObject<DataTypes>::SPtr mecaobject = New<MechanicalObject<DataTypes> >() ;
         typename ThisClass::SPtr thisobject = New<ThisClass >() ;
         mecaobject->init() ;
@@ -126,10 +124,7 @@ struct VolumeFromTetrahedronsTest : public sofa::testing::BaseTest, VolumeFromTe
     {
         DataRepository.addFirstPath(SOFTROBOTS_TEST_DIR);
 
-        Simulation* simu;
-        setSimulation(simu = new sofa::simulation::graph::DAGSimulation());
-
-        Node::SPtr node = simu->createNewGraph("root");
+        const Node::SPtr node = sofa::simulation::getSimulation()->createNewGraph("root");
 
         typename TetrahedronSetTopologyContainer::SPtr    mesh       = New< TetrahedronSetTopologyContainer >() ;
         typename MechanicalObject<DataTypes>::SPtr        mecaobject = New< MechanicalObject<DataTypes> >() ;

diff --git a/tests/component/engine/VolumeFromTrianglesTest.cpp b/tests/component/engine/VolumeFromTrianglesTest.cpp
@@ -92,10 +92,7 @@ struct VolumeFromTrianglesTest : public sofa::testing::BaseTest, VolumeFromTrian
 
     void normalTests()
     {
-        Simulation* simu;
-        setSimulation(simu = new sofa::simulation::graph::DAGSimulation());
-
-        Node::SPtr node = simu->createNewGraph("root");
+        Node::SPtr node = sofa::simulation::getSimulation()->createNewGraph("root");
         typename MechanicalObject<DataTypes>::SPtr mecaobject = New<MechanicalObject<DataTypes> >() ;
         typename ThisClass::SPtr thisobject = New<ThisClass >() ;
         mecaobject->init() ;
@@ -129,10 +126,7 @@ struct VolumeFromTrianglesTest : public sofa::testing::BaseTest, VolumeFromTrian
     {
         DataRepository.addFirstPath(SOFTROBOTS_TEST_DIR);
 
-        Simulation* simu;
-        setSimulation(simu = new sofa::simulation::graph::DAGSimulation());
-
-        Node::SPtr node = simu->createNewGraph("root");
+        Node::SPtr node = sofa::simulation::getSimulation()->createNewGraph("root");
 
         typename MeshTopology::SPtr                mesh       = New< MeshTopology >() ;
         typename MechanicalObject<DataTypes>::SPtr mecaobject = New< MechanicalObject<DataTypes> >() ;