Skip to content

Commit

Permalink
Make SetUp and TearDown final
Browse files Browse the repository at this point in the history
  • Loading branch information
alxbilger committed Jan 15, 2025
1 parent 59bafb5 commit 0dfe332
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 24 deletions.
44 changes: 22 additions & 22 deletions Sofa/framework/Simulation/simutest/parallel_scenes_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,31 +44,31 @@ class ParallelScenesTest : public virtual sofa::testing::BaseTest
{
}

void SetUp() override
void doSetUp() override
{
EXPECT_MSG_NOEMIT(Error, Warning);

sofa::simpleapi::importPlugin("Sofa.Component.AnimationLoop");
sofa::simpleapi::importPlugin("Sofa.Component.Collision.Detection.Algorithm");
sofa::simpleapi::importPlugin("Sofa.Component.Collision.Detection.Intersection");
sofa::simpleapi::importPlugin("Sofa.Component.Collision.Geometry");
sofa::simpleapi::importPlugin("Sofa.Component.Collision.Response.Contact");
sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Lagrangian.Correction");
sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Lagrangian.Solver");
sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Projective");
sofa::simpleapi::importPlugin("Sofa.Component.IO.Mesh");
sofa::simpleapi::importPlugin("Sofa.Component.LinearSolver.Iterative");
sofa::simpleapi::importPlugin("Sofa.Component.Mapping.Linear");
sofa::simpleapi::importPlugin("Sofa.Component.Mass");
sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Backward");
sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.FEM.Elastic");
sofa::simpleapi::importPlugin("Sofa.Component.StateContainer");
sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Constant");
sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic");
sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Grid");
sofa::simpleapi::importPlugin("Sofa.Component.Visual");
sofa::simpleapi::importPlugin("Sofa.GL.Component.Rendering3D");
sofa::simpleapi::importPlugin("Sofa.Component.LinearSystem");
sofa::simpleapi::importPlugin(Sofa.Component.AnimationLoop);
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Detection.Algorithm);
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Detection.Intersection);
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Geometry);
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Response.Contact);
sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Lagrangian.Correction);
sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Lagrangian.Solver);
sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Projective);
sofa::simpleapi::importPlugin(Sofa.Component.IO.Mesh);
sofa::simpleapi::importPlugin(Sofa.Component.LinearSolver.Iterative);
sofa::simpleapi::importPlugin(Sofa.Component.Mapping.Linear);
sofa::simpleapi::importPlugin(Sofa.Component.Mass);
sofa::simpleapi::importPlugin(Sofa.Component.ODESolver.Backward);
sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.FEM.Elastic);
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Constant);
sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic);
sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid);
sofa::simpleapi::importPlugin(Sofa.Component.Visual);
sofa::simpleapi::importPlugin(Sofa.GL.Component.Rendering3D);
sofa::simpleapi::importPlugin(Sofa.Component.LinearSystem);
}

void executeInParallel(const char* sceneStr, const std::size_t nbScenes, const std::size_t nbSteps)
Expand Down
4 changes: 2 additions & 2 deletions Sofa/framework/Testing/src/sofa/testing/BaseTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ class SOFA_TESTING_API BaseTest : public ::testing::Test
void loadPlugins(const std::initializer_list<std::string>& pluginNames);

private:
void SetUp() override ;
void TearDown() override ;
void SetUp() final ;
void TearDown() final ;

std::deque<sofa::testing::ScopedPlugin> m_loadedPlugins;
};
Expand Down

0 comments on commit 0dfe332

Please sign in to comment.