Skip to content

Commit 0dfe332

Browse files
committed
Make SetUp and TearDown final
1 parent 59bafb5 commit 0dfe332

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

Sofa/framework/Simulation/simutest/parallel_scenes_test.cpp

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,31 +44,31 @@ class ParallelScenesTest : public virtual sofa::testing::BaseTest
4444
{
4545
}
4646

47-
void SetUp() override
47+
void doSetUp() override
4848
{
4949
EXPECT_MSG_NOEMIT(Error, Warning);
5050

51-
sofa::simpleapi::importPlugin("Sofa.Component.AnimationLoop");
52-
sofa::simpleapi::importPlugin("Sofa.Component.Collision.Detection.Algorithm");
53-
sofa::simpleapi::importPlugin("Sofa.Component.Collision.Detection.Intersection");
54-
sofa::simpleapi::importPlugin("Sofa.Component.Collision.Geometry");
55-
sofa::simpleapi::importPlugin("Sofa.Component.Collision.Response.Contact");
56-
sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Lagrangian.Correction");
57-
sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Lagrangian.Solver");
58-
sofa::simpleapi::importPlugin("Sofa.Component.Constraint.Projective");
59-
sofa::simpleapi::importPlugin("Sofa.Component.IO.Mesh");
60-
sofa::simpleapi::importPlugin("Sofa.Component.LinearSolver.Iterative");
61-
sofa::simpleapi::importPlugin("Sofa.Component.Mapping.Linear");
62-
sofa::simpleapi::importPlugin("Sofa.Component.Mass");
63-
sofa::simpleapi::importPlugin("Sofa.Component.ODESolver.Backward");
64-
sofa::simpleapi::importPlugin("Sofa.Component.SolidMechanics.FEM.Elastic");
65-
sofa::simpleapi::importPlugin("Sofa.Component.StateContainer");
66-
sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Constant");
67-
sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic");
68-
sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Grid");
69-
sofa::simpleapi::importPlugin("Sofa.Component.Visual");
70-
sofa::simpleapi::importPlugin("Sofa.GL.Component.Rendering3D");
71-
sofa::simpleapi::importPlugin("Sofa.Component.LinearSystem");
51+
sofa::simpleapi::importPlugin(Sofa.Component.AnimationLoop);
52+
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Detection.Algorithm);
53+
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Detection.Intersection);
54+
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Geometry);
55+
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Response.Contact);
56+
sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Lagrangian.Correction);
57+
sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Lagrangian.Solver);
58+
sofa::simpleapi::importPlugin(Sofa.Component.Constraint.Projective);
59+
sofa::simpleapi::importPlugin(Sofa.Component.IO.Mesh);
60+
sofa::simpleapi::importPlugin(Sofa.Component.LinearSolver.Iterative);
61+
sofa::simpleapi::importPlugin(Sofa.Component.Mapping.Linear);
62+
sofa::simpleapi::importPlugin(Sofa.Component.Mass);
63+
sofa::simpleapi::importPlugin(Sofa.Component.ODESolver.Backward);
64+
sofa::simpleapi::importPlugin(Sofa.Component.SolidMechanics.FEM.Elastic);
65+
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
66+
sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Constant);
67+
sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic);
68+
sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid);
69+
sofa::simpleapi::importPlugin(Sofa.Component.Visual);
70+
sofa::simpleapi::importPlugin(Sofa.GL.Component.Rendering3D);
71+
sofa::simpleapi::importPlugin(Sofa.Component.LinearSystem);
7272
}
7373

7474
void executeInParallel(const char* sceneStr, const std::size_t nbScenes, const std::size_t nbSteps)

Sofa/framework/Testing/src/sofa/testing/BaseTest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ class SOFA_TESTING_API BaseTest : public ::testing::Test
6363
void loadPlugins(const std::initializer_list<std::string>& pluginNames);
6464

6565
private:
66-
void SetUp() override ;
67-
void TearDown() override ;
66+
void SetUp() final ;
67+
void TearDown() final ;
6868

6969
std::deque<sofa::testing::ScopedPlugin> m_loadedPlugins;
7070
};

0 commit comments

Comments
 (0)