[Orxonox-commit 6356] r11013 - code/trunk/test/core_plugin

[landauf at orxonox.net]

Author: landauf
Date: 2016-01-02 11:48:40 +0100 (Sat, 02 Jan 2016)
New Revision: 11013

Modified:
   code/trunk/test/core_plugin/PluginTest.cc
Log:
make sure the plugin is always unloaded after a test

Modified: code/trunk/test/core_plugin/PluginTest.cc
===================================================================
--- code/trunk/test/core_plugin/PluginTest.cc	2016-01-02 10:15:18 UTC (rev 11012)
+++ code/trunk/test/core_plugin/PluginTest.cc	2016-01-02 10:48:40 UTC (rev 11013)
@@ -20,6 +20,11 @@
         class PluginTest : public ::testing::Test
         {
             public:
+                PluginTest()
+                {
+                    this->plugin_ = NULL;
+                }
+
                 static void SetUpTestCase()
                 {
                     new Core("--noIOConsole");
@@ -29,18 +34,34 @@
                 {
                     delete &Core::getInstance();
                 }
+
+                void loadPlugin()
+                {
+                    this->plugin_ = new PluginReference("testplugin");
+                }
+
+                void unloadPlugin()
+                {
+                    delete this->plugin_;
+                    this->plugin_ = NULL;
+                }
+
+                virtual void TearDown()
+                {
+                    // make sure the plugin is unloaded
+                    this->unloadPlugin();
+                }
+
+            private:
+                PluginReference* plugin_;
         };
     }
 
-    PluginReference* loadPlugin()
-    {
-        return new PluginReference("testplugin");
-    }
 
     TEST_F(PluginTest, CanLoadPlugin)
     {
-        PluginReference* plugin = loadPlugin();
-        delete plugin;
+        this->loadPlugin();
+        this->unloadPlugin();
     }
 
 
@@ -56,33 +77,33 @@
     TEST_F(PluginTest, LoadsIdentifier)
     {
         EXPECT_TRUE(getIdentifier() == NULL);
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getIdentifier() != NULL);
-        delete plugin;
+        this->unloadPlugin();
     }
 
     TEST_F(PluginTest, UnloadsIdentifier)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getIdentifier() != NULL);
-        delete plugin;
+        this->unloadPlugin();
         EXPECT_TRUE(getIdentifier() == NULL);
     }
 
     TEST_F(PluginTest, ReloadsIdentifier)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getIdentifier() != NULL);
-        delete plugin;
+        this->unloadPlugin();
         EXPECT_TRUE(getIdentifier() == NULL);
-        plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getIdentifier() != NULL);
-        delete plugin;
+        this->unloadPlugin();
     }
 
     TEST_F(PluginTest, CanCreateObjectFromIdentifier)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
 
         Identifier* identifier = getIdentifier();
         ASSERT_TRUE(identifier != NULL);
@@ -95,7 +116,7 @@
 
         EXPECT_EQ(666, testclass->getValue());
 
-        delete plugin;
+        this->unloadPlugin();
     }
 
 
@@ -130,40 +151,40 @@
     TEST_F(PluginTest, LoadsSingleton)
     {
         EXPECT_TRUE(getSingleton() == NULL);
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getSingleton() != NULL);
-        delete plugin;
+        this->unloadPlugin();
     }
 
     TEST_F(PluginTest, UnloadsSingleton)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getSingleton() != NULL);
-        delete plugin;
+        this->unloadPlugin();
         EXPECT_TRUE(getSingleton() == NULL);
     }
 
     TEST_F(PluginTest, ReloadsSingleton)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getSingleton() != NULL);
-        delete plugin;
+        this->unloadPlugin();
         EXPECT_TRUE(getSingleton() == NULL);
-        plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getSingleton() != NULL);
-        delete plugin;
+        this->unloadPlugin();
     }
 
     TEST_F(PluginTest, CanCallFunctionOnSingleton)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
 
         Testsingleton* singleton = getSingleton();
         ASSERT_TRUE(singleton != NULL);
 
         EXPECT_EQ(999, singleton->getValue());
 
-        delete plugin;
+        this->unloadPlugin();
     }
 
 
@@ -187,38 +208,38 @@
     TEST_F(PluginTest, LoadsCommandLineArgument)
     {
         EXPECT_FALSE(hasCommandLineArgument());
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(hasCommandLineArgument());
-        delete plugin;
+        this->unloadPlugin();
     }
 
     TEST_F(PluginTest, UnloadsCommandLineArgument)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(hasCommandLineArgument());
-        delete plugin;
+        this->unloadPlugin();
         EXPECT_FALSE(hasCommandLineArgument());
     }
 
     TEST_F(PluginTest, ReloadsCommandLineArgument)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(hasCommandLineArgument());
-        delete plugin;
+        this->unloadPlugin();
         EXPECT_FALSE(hasCommandLineArgument());
-        plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(hasCommandLineArgument());
-        delete plugin;
+        this->unloadPlugin();
     }
 
     TEST_F(PluginTest, CommandLineArgumentHasCorrectValue)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
 
         ASSERT_TRUE(hasCommandLineArgument());
         EXPECT_EQ(333, CommandLineParser::getValue("testvalue").get<int>());
 
-        delete plugin;
+        this->unloadPlugin();
     }
 
 
@@ -234,39 +255,39 @@
     TEST_F(PluginTest, LoadsConsoleCommand)
     {
         EXPECT_TRUE(getConsoleCommand() == NULL);
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getConsoleCommand() != NULL);
-        delete plugin;
+        this->unloadPlugin();
     }
 
     TEST_F(PluginTest, UnloadsConsoleCommand)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getConsoleCommand() != NULL);
-        delete plugin;
+        this->unloadPlugin();
         EXPECT_TRUE(getConsoleCommand() == NULL);
     }
 
     TEST_F(PluginTest, ReloadsConsoleCommand)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getConsoleCommand() != NULL);
-        delete plugin;
+        this->unloadPlugin();
         EXPECT_TRUE(getConsoleCommand() == NULL);
-        plugin = loadPlugin();
+        this->loadPlugin();
         EXPECT_TRUE(getConsoleCommand() != NULL);
-        delete plugin;
+        this->unloadPlugin();
     }
 
     TEST_F(PluginTest, CanCallConsoleCommand)
     {
-        PluginReference* plugin = loadPlugin();
+        this->loadPlugin();
 
         ConsoleCommand* command = getConsoleCommand();
         ASSERT_TRUE(command != NULL);
 
         EXPECT_EQ(999, (*command->getExecutor())(333, 666).get<int>());
 
-        delete plugin;
+        this->unloadPlugin();
     }
 }