[tests] Template method design pattern from BaseTest in derived class…

…es (#5162) * [tests] Template method design pattern from BaseTest in derived classes * rename * use the deprecated function * Make SetUp and TearDown final * fix SofaCarving test * missing override
sofa-framework · Jan 22, 2025 · f8ed001 · f8ed001
1 parent 41bac37
commit f8ed001
Show file tree

Hide file tree

Showing 83 changed files with 172 additions and 152 deletions.
diff --git a/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp b/Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp
@@ -74,13 +74,13 @@ class TestCollisionPipeline : public BaseSimulationTest {
     void checkCollisionPipelineWithMissingContactManager();
     int checkCollisionPipelineWithMonkeyValueForDepth(int value);
 
-    void SetUp() override
+    void doSetUp() override
     {
         sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
         sofa::simpleapi::importPlugin(Sofa.Component.Collision);
     }
 
-    void TearDown() override
+    void doTearDown() override
     {
         if (root)
             sofa::simulation::node::unload(root);

diff --git a/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp b/Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp
@@ -54,12 +54,12 @@ namespace
 {
 
 struct TestLocalMinDistance : public BaseSimulationTest {
-    void SetUp() override
+    void doSetUp() override
     {
         sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
         sofa::simpleapi::importPlugin(Sofa.Component.Collision.Detection.Intersection);
     }
-    void TearDown() override
+    void doTearDown() override
     {
     }
 

diff --git a/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp b/Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp
@@ -70,7 +70,7 @@ namespace sofa {
 
 struct TestSphere : public BaseSimulationTest
 {
-    void SetUp() override
+    void doSetUp() override
     {
         sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
         sofa::simpleapi::importPlugin(Sofa.Component.Collision.Geometry);
@@ -79,7 +79,7 @@ struct TestSphere : public BaseSimulationTest
         m_proxIntersection->setAlarmDistance(1.0);
         m_proxIntersection->setContactDistance(1.0);
     }
-    void TearDown() override
+    void doTearDown() override
     {
     }
 

diff --git a/Sofa/Component/Collision/Geometry/tests/Triangle_test.cpp b/Sofa/Component/Collision/Geometry/tests/Triangle_test.cpp
@@ -56,10 +56,10 @@ namespace sofa
 {
     struct TestTriangle : public BaseTest
     {
-        void SetUp() override
+        void doSetUp() override
         {
         }
-        void TearDown() override
+        void doTearDown() override
         {
 
         }

diff --git a/Sofa/Component/Constraint/Projective/tests/AffineMovementProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/AffineMovementProjectiveConstraint_test.cpp
@@ -70,7 +70,7 @@ struct AffineMovementProjectiveConstraint_test : public BaseSimulationTest, Nume
     sofa::helper::RandomGenerator randomGenerator;
 
      // Create the context for the scene
-     void SetUp() override
+     void doSetUp() override
      {
          // Init simulation
          simulation = sofa::simulation::getSimulation();

diff --git a/Sofa/Component/Constraint/Projective/tests/DirectionProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/DirectionProjectiveConstraint_test.cpp
@@ -69,7 +69,7 @@ struct DirectionProjectiveConstraint_test : public BaseSimulationTest, NumericTe
     typename MechanicalObject::SPtr dofs;
 
      /// Create the context for the tests.
-    void SetUp() override
+    void doSetUp() override
     {
         //Init
         simulation = sofa::simulation::getSimulation();
@@ -219,7 +219,7 @@ struct DirectionProjectiveConstraint_test : public BaseSimulationTest, NumericTe
        return succeed;
     }
 
-    void TearDown() override
+    void doTearDown() override
     {
         if (root!=nullptr)
             sofa::simulation::node::unload(root);

diff --git a/Sofa/Component/Constraint/Projective/tests/LineProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/LineProjectiveConstraint_test.cpp
@@ -68,7 +68,7 @@ struct LineProjectiveConstraint_test : public BaseSimulationTest, NumericTest<ty
     typename MechanicalObject::SPtr dofs;
 
     /// Create the context for the tests.
-    void SetUp() override
+    void doSetUp() override
     {
         simulation = sofa::simulation::getSimulation();
         ASSERT_NE(simulation, nullptr);
@@ -204,7 +204,7 @@ const PointSetTopologyContainer::SPtr topology = core::objectmodel::New<PointSet
        return succeed;
     }
 
-    void TearDown() override
+    void doTearDown() override
     {
         if (root!=nullptr)
             sofa::simulation::node::unload(root);

diff --git a/Sofa/Component/Constraint/Projective/tests/PlaneProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/PlaneProjectiveConstraint_test.cpp
@@ -69,7 +69,7 @@ struct PlaneProjectiveConstraint_test : public BaseSimulationTest, NumericTest<t
     typename MechanicalObject::SPtr dofs;
 
     /// Create the context for the matrix tests.
-    void SetUp() override
+    void doSetUp() override
     {
         simulation = sofa::simulation::getSimulation();
         ASSERT_NE(simulation, nullptr);
@@ -203,7 +203,7 @@ const PointSetTopologyContainer::SPtr topology = core::objectmodel::New<PointSet
        return succeed;
     }
 
-    void TearDown() override
+    void doTearDown() override
     {
         if (root!=nullptr)
             sofa::simulation::node::unload(root);

diff --git a/Sofa/Component/Constraint/Projective/tests/PointProjectiveConstraint_test.cpp b/Sofa/Component/Constraint/Projective/tests/PointProjectiveConstraint_test.cpp
@@ -69,7 +69,7 @@ struct PointProjectiveConstraint_test : public BaseSimulationTest, NumericTest<t
     typename MechanicalObject::SPtr dofs;
 
     /// Create the context for the tests.
-    void SetUp() override
+    void doSetUp() override
     {
         simulation = sofa::simulation::getSimulation();
         ASSERT_NE(simulation, nullptr);
@@ -207,7 +207,7 @@ struct PointProjectiveConstraint_test : public BaseSimulationTest, NumericTest<t
        return succeed;
     }
 
-    void TearDown() override
+    void doTearDown() override
     {
         if (root!=nullptr)
             sofa::simulation::node::unload(root);

diff --git a/Sofa/Component/Engine/Analyze/tests/AverageCoord_test.cpp b/Sofa/Component/Engine/Analyze/tests/AverageCoord_test.cpp
@@ -57,7 +57,7 @@ struct AverageCoord_test : public BaseSimulationTest,
     typename MechanicalObject<DataTypes>::SPtr m_mecaobject;
 
 
-    void SetUp() override
+    void doSetUp() override
     {
         m_simu = sofa::simulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);

diff --git a/Sofa/Component/Engine/Analyze/tests/ClusteringEngine_test.cpp b/Sofa/Component/Engine/Analyze/tests/ClusteringEngine_test.cpp
@@ -57,7 +57,7 @@ struct ClusteringEngine_test : public BaseSimulationTest,
     typename MechanicalObject<DataTypes>::SPtr m_mecaobject;
 
 
-    void SetUp() override
+    void doSetUp() override
     {
         m_simu = sofa::simulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);

diff --git a/Sofa/Component/Engine/Generate/tests/ExtrudeEdgesAndGenerateQuads_test.cpp b/Sofa/Component/Engine/Generate/tests/ExtrudeEdgesAndGenerateQuads_test.cpp
@@ -55,7 +55,7 @@ struct ExtrudeEdgesAndGenerateQuads_test : public BaseSimulationTest,
     Node::SPtr m_node;
     typename ThisClass::SPtr m_thisObject;
 
-    void SetUp() override
+    void doSetUp() override
     {
         m_simu = sofa::simulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);

diff --git a/Sofa/Component/Engine/Generate/tests/MergePoints_test.cpp b/Sofa/Component/Engine/Generate/tests/MergePoints_test.cpp
@@ -49,7 +49,7 @@ struct MergePoints_test : public BaseSimulationTest,
     Simulation* m_simu;
     typename ThisClass::SPtr m_thisObject;
 
-    void SetUp() override
+    void doSetUp() override
     {
         m_simu = sofa::simulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);

diff --git a/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp b/Sofa/Component/Engine/Select/tests/BoxROI_test.cpp
@@ -70,7 +70,7 @@ struct BoxROITest :  public sofa::testing::BaseTest
     Node::SPtr m_node;
     typename TheBoxROI::SPtr m_boxroi;
 
-    void onSetUp() override
+    void doSetUp() override
     {
         this->loadPlugins({
             Sofa.Component.StateContainer,
@@ -87,7 +87,7 @@ struct BoxROITest :  public sofa::testing::BaseTest
         m_node->addObject(m_boxroi);
     }
 
-    void onTearDown() override
+    void doTearDown() override
     {
         if (m_root != nullptr){
             sofa::simulation::node::unload(m_root);

diff --git a/Sofa/Component/Engine/Select/tests/ComplementaryROI_test.cpp b/Sofa/Component/Engine/Select/tests/ComplementaryROI_test.cpp
@@ -55,7 +55,7 @@ struct ComplementaryROI_test : public BaseSimulationTest,
     typename ThisClass::SPtr m_thisObject;
 
 
-    void SetUp() override
+    void doSetUp() override
     {
         m_simu = sofa::simulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);

diff --git a/Sofa/Component/Engine/Select/tests/MeshROI_test.cpp b/Sofa/Component/Engine/Select/tests/MeshROI_test.cpp
@@ -61,7 +61,7 @@ struct MeshROI_test : public BaseSimulationTest,
     Node::SPtr m_root;
     ThisClass* m_thisObject;
 
-    void SetUp() override
+    void doSetUp() override
     {
         simpleapi::importPlugin(Sofa.Component.Engine.Select);
         simpleapi::importPlugin(Sofa.Component.Topology.Container.Constant);
@@ -86,7 +86,7 @@ struct MeshROI_test : public BaseSimulationTest,
         ASSERT_NE(m_thisObject, nullptr) ;
     }
 
-    void TearDown() override
+    void doTearDown() override
     {
         sofa::simulation::node::unload(m_root) ;
     }

diff --git a/Sofa/Component/Engine/Select/tests/MeshSubsetEngine_test.cpp b/Sofa/Component/Engine/Select/tests/MeshSubsetEngine_test.cpp
@@ -31,7 +31,7 @@ struct MeshSubsetEngine_test : public testing::BaseSimulationTest
     sofa::simulation::Node::SPtr m_root;
     typename component::engine::select::MeshSubsetEngine<_DataTypes>::SPtr m_engine;
 
-    void SetUp() override
+    void doSetUp() override
     {
         simpleapi::importPlugin(Sofa.Component.Engine.Select);
 
@@ -44,7 +44,7 @@ struct MeshSubsetEngine_test : public testing::BaseSimulationTest
         m_root->addObject(m_engine);
     }
 
-    void TearDown() override
+    void doTearDown() override
     {
         sofa::simulation::node::unload(m_root) ;
     }

diff --git a/Sofa/Component/Engine/Select/tests/PlaneROI_test.cpp b/Sofa/Component/Engine/Select/tests/PlaneROI_test.cpp
@@ -61,7 +61,7 @@ struct PlaneROI_test : public BaseSimulationTest,
     Node::SPtr m_node1, m_node2;
     typename ThisClass::SPtr m_thisObject;
 
-    void SetUp() override
+    void doSetUp() override
     {
         // SetUp1
         m_simu = sofa::simulation::getSimulation();

diff --git a/Sofa/Component/Engine/Select/tests/SphereROI_test.cpp b/Sofa/Component/Engine/Select/tests/SphereROI_test.cpp
@@ -61,7 +61,7 @@ struct SphereROI_test : public BaseSimulationTest,
     Node::SPtr m_node;
     typename ThisClass::SPtr m_thisObject;
 
-    void SetUp() override
+    void doSetUp() override
     {
         m_simu = sofa::simulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);

diff --git a/Sofa/Component/Engine/Transform/tests/DifferenceEngine_test.cpp b/Sofa/Component/Engine/Transform/tests/DifferenceEngine_test.cpp
@@ -54,7 +54,7 @@ struct DifferenceEngine_test : public BaseSimulationTest,
     Node::SPtr m_node;
     typename ThisClass::SPtr m_thisObject;
 
-    void SetUp() override
+    void doSetUp() override
     {
         m_simu = sofa::simulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);

diff --git a/Sofa/Component/Engine/Transform/tests/DilateEngine_test.cpp b/Sofa/Component/Engine/Transform/tests/DilateEngine_test.cpp
@@ -52,7 +52,7 @@ struct DilateEngine_test : public BaseSimulationTest,
     Node::SPtr m_node;
     typename ThisClass::SPtr m_thisObject;
 
-    void SetUp() override
+    void doSetUp() override
     {
         m_simu = sofa::simulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);

diff --git a/Sofa/Component/Engine/Transform/tests/SmoothMeshEngine_test.cpp b/Sofa/Component/Engine/Transform/tests/SmoothMeshEngine_test.cpp
@@ -53,7 +53,7 @@ struct SmoothMeshEngine_test : public BaseSimulationTest,
 	Node::SPtr m_node;
 	typename ThisClass::SPtr m_thisObject;
 
-	void SetUp() override
+	void doSetUp() override
 	{
 		m_simu = sofa::simulation::getSimulation();
 		ASSERT_NE(m_simu, nullptr);

diff --git a/Sofa/Component/IO/Mesh/tests/MeshExporter_test.cpp b/Sofa/Component/IO/Mesh/tests/MeshExporter_test.cpp
@@ -75,13 +75,13 @@ class MeshExporter_test
     /// remove the file created...
     std::vector<string> dataPath;
 
-    void SetUp() override
+    void doSetUp() override
     {
         sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
         sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid);
     }
 
-    void TearDown() override
+    void doTearDown() override
     {
         for (const auto& pathToRemove : dataPath)
         {

diff --git a/Sofa/Component/IO/Mesh/tests/MeshGmshLoader_test.cpp b/Sofa/Component/IO/Mesh/tests/MeshGmshLoader_test.cpp
@@ -51,7 +51,7 @@ namespace meshgmshloader_test
         /**
             * Constructor call for each test
             */
-        void SetUp() override {}
+        void doSetUp() override {}
 
         /**
             * Helper function to check mesh loading.

diff --git a/Sofa/Component/IO/Mesh/tests/STLExporter_test.cpp b/Sofa/Component/IO/Mesh/tests/STLExporter_test.cpp
@@ -65,14 +65,14 @@ class STLExporter_test : public BaseSimulationTest {
     /// remove the file created...
     std::vector<std::string> dataPath ;
 
-    void SetUp() override
+    void doSetUp() override
     {
         sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
         sofa::simpleapi::importPlugin(Sofa.Component.Visual);
         sofa::simpleapi::importPlugin(Sofa.Component.IO.Mesh);
     }
 
-    void TearDown() override
+    void doTearDown() override
     {
         for (const auto& pathToRemove : dataPath)
         {

diff --git a/Sofa/Component/IO/Mesh/tests/VisualModelOBJExporter_test.cpp b/Sofa/Component/IO/Mesh/tests/VisualModelOBJExporter_test.cpp
@@ -62,11 +62,11 @@ class VisualModelOBJExporter_test : public BaseSimulationTest {
     /// remove the file created...
     std::vector<std::string> dataPath ;
 
-    void SetUp() override
+    void doSetUp() override
     {
     }
 
-    void TearDown() override
+    void doTearDown() override
     {
         for (const auto& pathToRemove : dataPath)
         {

diff --git a/Sofa/Component/Mapping/Linear/tests/BarycentricMapping_test.cpp b/Sofa/Component/Mapping/Linear/tests/BarycentricMapping_test.cpp
@@ -74,7 +74,7 @@ struct BarycentricMapperTriangleSetTopologyTest :  public BaseTest, public Baryc
     typename Out::VecCoord m_out;
     TriangleSetTopologyContainer::SPtr m_topology;
 
-    void SetUp() override
+    void doSetUp() override
     {
         m_in.push_back(Vec3(0.5, 1.5, 0.0));
         m_in.push_back(Vec3(1.5, 0.0, 2.5));

diff --git a/Sofa/Component/Mapping/NonLinear/tests/RigidMapping_test.cpp b/Sofa/Component/Mapping/NonLinear/tests/RigidMapping_test.cpp
@@ -74,7 +74,7 @@ struct RigidMappingTest : public sofa::mapping_test::Mapping_test<_RigidMapping>
     typedef typename OutMechanicalObject::ReadVecCoord ReadOutVecCoord;
     typedef typename OutMechanicalObject::ReadVecDeriv ReadOutVecDeriv;
 
-    void SetUp() override
+    void doSetUp() override
     {
     }
 

diff --git a/Sofa/Component/Mapping/NonLinear/tests/SquareDistanceMapping_test.cpp b/Sofa/Component/Mapping/NonLinear/tests/SquareDistanceMapping_test.cpp
@@ -150,7 +150,7 @@ struct SquareDistanceMappingCompare_test : NumericTest<SReal>
     simulation::Node::SPtr oneMapping;
     simulation::Node::SPtr twoMappings;
 
-    void onSetUp() override
+    void doSetUp() override
     {
         root = simulation::getSimulation()->createNewNode("root");
 

diff --git a/Sofa/Component/Mass/tests/DiagonalMass_test.cpp b/Sofa/Component/Mass/tests/DiagonalMass_test.cpp
@@ -96,7 +96,7 @@ class DiagonalMass_test : public BaseTest
     typename MechanicalObject<DataTypes>::SPtr mstate;
     typename DiagonalMass<DataTypes>::SPtr mass;
 
-    void SetUp() override
+    void doSetUp() override
     {
         sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic);
         sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid);
@@ -107,7 +107,7 @@ class DiagonalMass_test : public BaseTest
         root = simulation::getSimulation()->createNewGraph("root");
     }
 
-    void TearDown() override
+    void doTearDown() override
     {
         if (root!=nullptr)
             sofa::simulation::node::unload(root);