support multiple calls to loadPlugins

sofa-framework · Dec 20, 2024 · b45f801 · b45f801
1 parent a33b55b
commit b45f801
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Sofa/framework/Testing/src/sofa/testing/BaseTest.cpp b/Sofa/framework/Testing/src/sofa/testing/BaseTest.cpp
@@ -96,7 +96,7 @@ BaseTest::~BaseTest() {}
 void BaseTest::loadPlugins(
     const std::initializer_list<std::string>& pluginNames)
 {
-    m_loadedPlugins = makeScopedPlugin(pluginNames);
+    m_loadedPlugins.emplace_back(pluginNames.begin(), pluginNames.end());
 }
 
 void BaseTest::SetUp()
@@ -106,7 +106,7 @@ void BaseTest::SetUp()
 
 void BaseTest::TearDown()
 {
-    m_loadedPlugins.reset();
+    m_loadedPlugins.clear();
     onTearDown();
 }
 

diff --git a/Sofa/framework/Testing/src/sofa/testing/BaseTest.h b/Sofa/framework/Testing/src/sofa/testing/BaseTest.h
@@ -21,6 +21,7 @@
 ******************************************************************************/
 #pragma once
 
+#include <deque>
 #include <sofa/testing/config.h>
 
 #include <gtest/gtest.h>
@@ -58,7 +59,7 @@ class SOFA_TESTING_API BaseTest : public ::testing::Test
     void SetUp() override ;
     void TearDown() override ;
 
-    std::unique_ptr<sofa::testing::ScopedPlugin> m_loadedPlugins;
+    std::deque<sofa::testing::ScopedPlugin> m_loadedPlugins;
 };
 
 } // namespace sofa::testing