Skip to content

Commit 9ce0268

Browse files
committed
support multiple calls to loadPlugins
1 parent 81ae772 commit 9ce0268

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ BaseTest::~BaseTest() {}
9696
void BaseTest::loadPlugins(
9797
const std::initializer_list<std::string>& pluginNames)
9898
{
99-
m_loadedPlugins = makeScopedPlugin(pluginNames);
99+
m_loadedPlugins.emplace_back(pluginNames.begin(), pluginNames.end());
100100
}
101101

102102
void BaseTest::SetUp()
@@ -106,7 +106,7 @@ void BaseTest::SetUp()
106106

107107
void BaseTest::TearDown()
108108
{
109-
m_loadedPlugins.reset();
109+
m_loadedPlugins.clear();
110110
onTearDown();
111111
}
112112

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
******************************************************************************/
2222
#pragma once
2323

24+
#include <deque>
2425
#include <sofa/testing/config.h>
2526

2627
#include <gtest/gtest.h>
@@ -58,7 +59,7 @@ class SOFA_TESTING_API BaseTest : public ::testing::Test
5859
void SetUp() override ;
5960
void TearDown() override ;
6061

61-
std::unique_ptr<sofa::testing::ScopedPlugin> m_loadedPlugins;
62+
std::deque<sofa::testing::ScopedPlugin> m_loadedPlugins;
6263
};
6364

6465
} // namespace sofa::testing

0 commit comments

Comments
 (0)