Skip to content

Commit d94c419

Browse files
authored
[tests] Prevent test leaks when loading plugins (sofa-framework#5344)
* [tests] Prevent test leaks when loading plugins * missing plugin * fix tests * missing plugin * missing plugins * missing plugins * missing plugins
1 parent cbddc29 commit d94c419

37 files changed

Lines changed: 331 additions & 175 deletions

File tree

Sofa/Component/Collision/Detection/Algorithm/tests/CollisionPipeline_test.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,12 @@ class TestCollisionPipeline : public BaseSimulationTest {
7676

7777
void doSetUp() override
7878
{
79-
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
80-
sofa::simpleapi::importPlugin(Sofa.Component.Collision);
79+
this->loadPlugins({
80+
Sofa.Component.StateContainer,
81+
Sofa.Component.Collision.Detection.Algorithm,
82+
Sofa.Component.Collision.Detection.Intersection,
83+
Sofa.Component.Collision.Response.Contact
84+
});
8185
}
8286

8387
void doTearDown() override

Sofa/Component/Collision/Detection/Intersection/tests/LocalMinDistance_test.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ namespace
5656
struct TestLocalMinDistance : public BaseSimulationTest {
5757
void doSetUp() override
5858
{
59-
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
60-
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Detection.Intersection);
61-
}
62-
void doTearDown() override
63-
{
59+
loadPlugins({Sofa.Component.StateContainer, Sofa.Component.Collision.Detection.Intersection});
6460
}
6561

6662
void checkAttributes();

Sofa/Component/Collision/Geometry/tests/Sphere_test.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,12 @@ struct TestSphere : public BaseSimulationTest
7272
{
7373
void doSetUp() override
7474
{
75-
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
76-
sofa::simpleapi::importPlugin(Sofa.Component.Collision.Geometry);
75+
loadPlugins({Sofa.Component.StateContainer, Sofa.Component.Collision.Geometry});
7776

7877
m_proxIntersection = sofa::core::objectmodel::New<MinProximityIntersection>();
7978
m_proxIntersection->setAlarmDistance(1.0);
8079
m_proxIntersection->setContactDistance(1.0);
8180
}
82-
void doTearDown() override
83-
{
84-
}
8581

8682
bool rigidRigid1();
8783
bool rigidRigid2();

Sofa/Component/Engine/Select/tests/MeshROI_test.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,11 @@ struct MeshROI_test : public BaseSimulationTest,
6363

6464
void doSetUp() override
6565
{
66-
simpleapi::importPlugin(Sofa.Component.Engine.Select);
67-
simpleapi::importPlugin(Sofa.Component.Topology.Container.Constant);
68-
simpleapi::importPlugin(Sofa.Component.IO.Mesh);
66+
loadPlugins({
67+
Sofa.Component.Engine.Select,
68+
Sofa.Component.Topology.Container.Constant,
69+
Sofa.Component.IO.Mesh
70+
});
6971

7072
// SetUp3
7173
const string scene2 =

Sofa/Component/Engine/Select/tests/MeshSubsetEngine_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ struct MeshSubsetEngine_test : public testing::BaseSimulationTest
3333

3434
void doSetUp() override
3535
{
36-
simpleapi::importPlugin(Sofa.Component.Engine.Select);
36+
loadPlugins({Sofa.Component.Engine.Select});
3737

3838
m_root = simulation::getSimulation()->createNewNode("root");
3939
ASSERT_NE(nullptr, m_root);

Sofa/Component/Engine/Select/tests/PlaneROI_test.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ struct PlaneROI_test : public BaseSimulationTest,
7171
m_node1 = m_simu->createNewGraph("root");
7272
m_node1->addObject(m_thisObject);
7373

74+
this->loadPlugins({Sofa.Component.Engine.Select});
75+
7476

7577
// SetUp2
7678
const string scene1 =

Sofa/Component/IO/Mesh/tests/MeshExporter_test.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,10 @@ class MeshExporter_test
7979

8080
void doSetUp() override
8181
{
82-
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
83-
sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid);
82+
loadPlugins({
83+
Sofa.Component.StateContainer,
84+
Sofa.Component.Topology.Container.Grid
85+
});
8486
}
8587

8688
void doTearDown() override

Sofa/Component/IO/Mesh/tests/STLExporter_test.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,11 @@ class STLExporter_test : public BaseSimulationTest {
6767

6868
void doSetUp() override
6969
{
70-
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
71-
sofa::simpleapi::importPlugin(Sofa.Component.Visual);
72-
sofa::simpleapi::importPlugin(Sofa.Component.IO.Mesh);
70+
loadPlugins({
71+
Sofa.Component.StateContainer,
72+
Sofa.Component.Visual,
73+
Sofa.Component.IO.Mesh
74+
});
7375
}
7476

7577
void doTearDown() override

Sofa/Component/LinearSystem/tests/MappingGraph_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ TEST(MappingGraph, diamondMapping)
176176
sofa::simulation::Node::SPtr root = simulation->createNewGraph("root");
177177
EXPECT_EQ(root->getName(), "root");
178178

179-
sofa::simpleapi::importPlugin(Sofa.Component.Mapping.Linear);
179+
const auto plugins = sofa::testing::makeScopedPlugin({Sofa.Component.Mapping.Linear});
180180

181181
const auto top = sofa::core::objectmodel::New<sofa::component::statecontainer::MechanicalObject<sofa::defaulttype::Vec3Types> >();
182182
root->addObject(top);

Sofa/Component/Mass/tests/DiagonalMass_test.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,12 @@ class DiagonalMass_test : public BaseTest
9898

9999
void doSetUp() override
100100
{
101-
sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Dynamic);
102-
sofa::simpleapi::importPlugin(Sofa.Component.Topology.Container.Grid);
103-
sofa::simpleapi::importPlugin(Sofa.Component.StateContainer);
104-
sofa::simpleapi::importPlugin(Sofa.Component.Mass);
101+
this->loadPlugins({
102+
Sofa.Component.Topology.Container.Dynamic,
103+
Sofa.Component.Topology.Container.Grid,
104+
Sofa.Component.StateContainer,
105+
Sofa.Component.Mass
106+
});
105107

106108
simulation = simulation::getSimulation();
107109
root = simulation::getSimulation()->createNewGraph("root");

0 commit comments

Comments
 (0)