From d36604e2f2d5626ba69905b301c3cd61242e70d1 Mon Sep 17 00:00:00 2001
From: Damien Marchal <damien.marchal@univ-lille.fr>
Date: Wed, 26 Aug 2026 14:57:46 +0200
Subject: [PATCH] Apply changes from PR #6261

---
 tests/component/constraint/SurfacePressureConstraintTest.cpp | 2 +-
 tests/component/constraint/UnilateralPlaneConstraintTest.cpp | 4 ++--
 tests/component/controller/AnimationEditorTest.cpp           | 5 +++--
 tests/component/controller/DataVariationLimiterTest.cpp      | 4 ++--
 tests/component/controller/SerialPortBridgeGenericTest.cpp   | 5 +++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tests/component/constraint/SurfacePressureConstraintTest.cpp b/tests/component/constraint/SurfacePressureConstraintTest.cpp
index ca0e1d7e..4ea07000 100644
--- a/tests/component/constraint/SurfacePressureConstraintTest.cpp
+++ b/tests/component/constraint/SurfacePressureConstraintTest.cpp
@@ -42,7 +42,7 @@ using sofa::simulation::SceneLoaderXML ;
 
 #include <sofa/simpleapi/SimpleApi.h>
 
-#include <sofa/simulation/graph/DAGSimulation.h>
+#include <sofa/simulation/Simulation.h>
 using sofa::simulation::Simulation ;
 using sofa::simulation::Node ;
 using sofa::core::objectmodel::New ;
diff --git a/tests/component/constraint/UnilateralPlaneConstraintTest.cpp b/tests/component/constraint/UnilateralPlaneConstraintTest.cpp
index 03ae0bec..9cc05624 100644
--- a/tests/component/constraint/UnilateralPlaneConstraintTest.cpp
+++ b/tests/component/constraint/UnilateralPlaneConstraintTest.cpp
@@ -45,7 +45,7 @@ using sofa::defaulttype::Vec3Types ;
 #include <sofa/simulation/common/SceneLoaderXML.h>
 using sofa::simulation::SceneLoaderXML ;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
+#include <sofa/simulation/Simulation.h>
 using sofa::simulation::Simulation ;
 #include <sofa/simulation/Node.h>
 using sofa::simulation::Node ;
@@ -88,7 +88,7 @@ struct UnilateralPlaneConstraintTest : public sofa::testing::BaseTest,
 
     void normalTests()
     {
-        const Node::SPtr node = sofa::simulation::getSimulation()->createNewGraph("root");
+        const Node::SPtr node = sofa::simulation::MainSimulation::getSimulation()->createNewGraph("root");
         typename MechanicalObject<DataTypes>::SPtr mecaobject = New<MechanicalObject<DataTypes> >() ;
         typename ThisClass::SPtr thisobject = New<ThisClass >() ;
 
diff --git a/tests/component/controller/AnimationEditorTest.cpp b/tests/component/controller/AnimationEditorTest.cpp
index 50f9d2a6..7742cbb4 100644
--- a/tests/component/controller/AnimationEditorTest.cpp
+++ b/tests/component/controller/AnimationEditorTest.cpp
@@ -41,8 +41,9 @@ using sofa::simulation::DefaultAnimationLoop;
 using sofa::core::topology::BaseMeshTopology ;
 using sofa::core::objectmodel::Data ;
 
-#include <sofa/simulation/graph/DAGSimulation.h>
+#include <sofa/simulation/Simulation.h>
 using sofa::simulation::Simulation ;
+
 #include <sofa/simulation/Node.h>
 using sofa::simulation::Node ;
 using sofa::core::objectmodel::New ;
@@ -92,7 +93,7 @@ struct AnimationEditorTest : public sofa::testing::BaseTest, controller::Animati
 
     void doSetUp() override
     {
-        m_node = sofa::simulation::getSimulation()->createNewGraph("root");
+        m_node = sofa::simulation::MainSimulation::getSimulation()->createNewGraph("root");
         m_mecaobject = New<MechanicalObject<DataTypes> >() ;
         m_mecaobject->init() ;
         m_node->addObject(m_mecaobject) ;
diff --git a/tests/component/controller/DataVariationLimiterTest.cpp b/tests/component/controller/DataVariationLimiterTest.cpp
index e2b8d350..fa0f901f 100644
--- a/tests/component/controller/DataVariationLimiterTest.cpp
+++ b/tests/component/controller/DataVariationLimiterTest.cpp
@@ -37,7 +37,7 @@ using std::string ;
 
 #include <sofa/linearalgebra/FullVector.h>
 
-#include <sofa/simulation/graph/DAGSimulation.h>
+#include <sofa/simulation/Simulation.h>
 using sofa::simulation::Simulation ;
 #include <sofa/simulation/Node.h>
 using sofa::simulation::Node ;
@@ -76,7 +76,7 @@ struct DataVariationLimiterTest : public sofa::testing::BaseTest, DataVariationL
 
     void doSetUp() override
     {
-        m_node = sofa::simulation::getSimulation()->createNewGraph("root");
+        m_node = sofa::simulation::MainSimulation::getSimulation()->createNewGraph("root");
     }
 
     void normalTests(){
diff --git a/tests/component/controller/SerialPortBridgeGenericTest.cpp b/tests/component/controller/SerialPortBridgeGenericTest.cpp
index c85381cf..db79559f 100644
--- a/tests/component/controller/SerialPortBridgeGenericTest.cpp
+++ b/tests/component/controller/SerialPortBridgeGenericTest.cpp
@@ -37,8 +37,9 @@ using std::string ;
 
 #include <sofa/linearalgebra/FullVector.h>
 
-#include <sofa/simulation/graph/DAGSimulation.h>
+#include <sofa/simulation/Simulation.h>
 using sofa::simulation::Simulation ;
+
 #include <sofa/simulation/Node.h>
 using sofa::simulation::Node ;
 using sofa::core::objectmodel::New ;
@@ -84,7 +85,7 @@ struct SerialPortBridgeGenericTest : public sofa::testing::BaseTest, SerialPortB
 
     void doSetUp() override
     {
-        m_node = sofa::simulation::getSimulation()->createNewGraph("root");
+        m_node = sofa::simulation::MainSimulation::getSimulation()->createNewGraph("root");
     }
 
     void normalTests(){