unload plugins at tear down

Author: alxbilger

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

@@ -70,11 +70,12 @@ struct BoxROITest :  public sofa::testing::BaseTest
     Node::SPtr m_node;
     typename TheBoxROI::SPtr m_boxroi;
 
-    void SetUp() override
+    void onSetUp() override
     {
-        sofa::simpleapi::importPlugin("Sofa.Component.StateContainer");
-        sofa::simpleapi::importPlugin("Sofa.Component.Topology.Container.Dynamic");
-        sofa::simpleapi::importPlugin("Sofa.Component.Engine.Select");
+        this->loadPlugins({
+            "Sofa.Component.StateContainer",
+            "Sofa.Component.Topology.Container.Dynamic",
+            "Sofa.Component.Engine.Select"});
 
         m_simu = sofa::simulation::getSimulation();
         ASSERT_NE(m_simu, nullptr);
@@ -86,7 +87,7 @@ struct BoxROITest :  public sofa::testing::BaseTest
         m_node->addObject(m_boxroi);
     }
 
-    void TearDown() override
+    void onTearDown() override
     {
         if (m_root != nullptr){
             sofa::simulation::node::unload(m_root);

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

@@ -93,13 +93,20 @@ BaseTest::BaseTest() :
 
 BaseTest::~BaseTest() {}
 
+void BaseTest::loadPlugins(
+    const std::initializer_list<std::string>& pluginNames)
+{
+    m_loadedPlugins = makeScopedPlugin(pluginNames);
+}
+
 void BaseTest::SetUp()
 {
     onSetUp();
 }
 
 void BaseTest::TearDown()
 {
+    m_loadedPlugins.reset();
     onTearDown();
 }
 

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

@@ -25,6 +25,7 @@
 
 #include <gtest/gtest.h>
 #include <sofa/testing/TestMessageHandler.h>
+#include <sofa/testing/ScopedPlugin.h>
 
 namespace sofa::testing
 {
@@ -51,9 +52,13 @@ class SOFA_TESTING_API BaseTest : public ::testing::Test
     /// Seed value
     static int seed;
 
+    void loadPlugins(const std::initializer_list<std::string>& pluginNames);
+
 private:
     void SetUp() override ;
     void TearDown() override ;
+
+    std::unique_ptr<sofa::testing::ScopedPlugin> m_loadedPlugins;
 };
 
 } // namespace sofa::testing

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

@@ -25,9 +25,9 @@
 namespace sofa::testing
 {
 
-ScopedPlugin::ScopedPlugin(const std::string& pluginName, const bool unloadAllPlugins,
+ScopedPlugin::ScopedPlugin(const std::string& pluginName,
                            helper::system::PluginManager* pluginManager)
-: m_pluginManager(pluginManager), m_unloadAllPlugins(unloadAllPlugins)
+: m_pluginManager(pluginManager)
 {
     addPlugin(pluginName);
 }
@@ -36,22 +36,12 @@ ScopedPlugin::~ScopedPlugin()
 {
     if (m_pluginManager)
     {
-        if (m_unloadAllPlugins)
+        for (const auto& pluginName : m_loadedPlugins)
         {
-            for(const auto& [loadedPath, loadedPlugin] : m_pluginManager->getPluginMap())
+            const auto [path, isLoaded] = m_pluginManager->isPluginLoaded(pluginName);
+            if (isLoaded)
             {
-                m_pluginManager->unloadPlugin(loadedPath);
-            }
-        }
-        else
-        {
-            for (const auto& pluginName : m_loadedPlugins)
-            {
-                const auto [path, isLoaded] = m_pluginManager->isPluginLoaded(pluginName);
-                if (isLoaded)
-                {
-                    m_pluginManager->unloadPlugin(path);
-                }
+                m_pluginManager->unloadPlugin(path);
             }
         }
     }

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

@@ -34,15 +34,13 @@ struct SOFA_TESTING_API ScopedPlugin
 
     explicit ScopedPlugin(
         const std::string& pluginName,
-        bool unloadAllPlugins = true,
         helper::system::PluginManager* pluginManager = &helper::system::PluginManager::getInstance());
 
     template<class InputIt>
     ScopedPlugin(
         InputIt first, InputIt last,
-        bool unloadAllPlugins = true,
         helper::system::PluginManager* pluginManager = &helper::system::PluginManager::getInstance())
-    : m_pluginManager(pluginManager), m_unloadAllPlugins(unloadAllPlugins)
+    : m_pluginManager(pluginManager)
     {
         while (first != last)
         {
@@ -54,12 +52,17 @@ struct SOFA_TESTING_API ScopedPlugin
 
 private:
     helper::system::PluginManager* m_pluginManager { nullptr };
-    bool m_unloadAllPlugins { true };
 
     std::set<std::string> m_loadedPlugins;
 
     void addPlugin(const std::string& pluginName);
 };
 
 
+inline std::unique_ptr<ScopedPlugin> makeScopedPlugin(const std::initializer_list<std::string>& pluginNames)
+{
+    return std::make_unique<ScopedPlugin>(pluginNames.begin(), pluginNames.end());
+}
+
+
 }