From 4e923725ef39dc5c93bc43b3c38e3d784554ddb8 Mon Sep 17 00:00:00 2001
From: Walter Van Herck <w.van.herck@fz-juelich.de>
Date: Tue, 28 Apr 2015 16:14:23 +0200
Subject: [PATCH] Removed shared_ptr usage for FunctionalTest
---
App/src/TestFunctionalTests.cpp | 2 +-
Core/StandardSamples/FunctionalTestRegistry.cpp | 8 +++++---
Core/StandardSamples/FunctionalTestRegistry.h | 4 +---
Core/StandardSamples/IFunctionalTest.h | 3 ---
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/App/src/TestFunctionalTests.cpp b/App/src/TestFunctionalTests.cpp
index b20386d378d..58fd2ce99fe 100644
--- a/App/src/TestFunctionalTests.cpp
+++ b/App/src/TestFunctionalTests.cpp
@@ -30,7 +30,7 @@ void TestFunctionalTests::execute()
if(!readTestNames()) return;
for(size_t i=0; i<m_testNames.size(); ++i) {
- FunctionalTest_t test = m_testRegistry.getTest(m_testNames[i]);
+ boost::scoped_ptr<FunctionalTest> test(m_testRegistry.getTest(m_testNames[i]));
test->getSimulation()->setProgramOptions(mp_options);
test->runTest();
test->analyseResults();
diff --git a/Core/StandardSamples/FunctionalTestRegistry.cpp b/Core/StandardSamples/FunctionalTestRegistry.cpp
index b3c4620270e..442abd8c07f 100644
--- a/Core/StandardSamples/FunctionalTestRegistry.cpp
+++ b/Core/StandardSamples/FunctionalTestRegistry.cpp
@@ -19,6 +19,8 @@
#include <iostream>
#include <iomanip>
+#include <boost/scoped_ptr.hpp>
+
FunctionalTestRegistry::Catalogue FunctionalTestRegistry::m_catalogue = FunctionalTestRegistry::Catalogue();
@@ -176,9 +178,9 @@ bool FunctionalTestRegistry::isRegisteredName(const std::string &name)
}
-FunctionalTest_t FunctionalTestRegistry::getTest(const std::string &name)
+FunctionalTest* FunctionalTestRegistry::getTest(const std::string &name)
{
- FunctionalTest_t test(new FunctionalTest(m_catalogue.getInfo(name)));
+ FunctionalTest* test = new FunctionalTest(m_catalogue.getInfo(name));
return test;
}
@@ -186,7 +188,7 @@ FunctionalTest_t FunctionalTestRegistry::getTest(const std::string &name)
int FUNCTIONAL_TEST(const std::string &name)
{
FunctionalTestRegistry registry;
- FunctionalTest_t test = registry.getTest(name);
+ boost::scoped_ptr<FunctionalTest> test(registry.getTest(name));
test->runTest();
return test->analyseResults();
}
diff --git a/Core/StandardSamples/FunctionalTestRegistry.h b/Core/StandardSamples/FunctionalTestRegistry.h
index ab857ada507..a42ecf17dad 100644
--- a/Core/StandardSamples/FunctionalTestRegistry.h
+++ b/Core/StandardSamples/FunctionalTestRegistry.h
@@ -44,9 +44,7 @@ public:
void printCatalogue() { m_catalogue.print(); }
- FunctionalTest_t getTest(const std::string &name);
-
- //FunctionalTest_t runTest(const std::string &name);
+ FunctionalTest* getTest(const std::string &name);
bool isRegisteredName(const std::string &name);
diff --git a/Core/StandardSamples/IFunctionalTest.h b/Core/StandardSamples/IFunctionalTest.h
index 6c6e1bba3c2..9d048325f83 100644
--- a/Core/StandardSamples/IFunctionalTest.h
+++ b/Core/StandardSamples/IFunctionalTest.h
@@ -86,7 +86,4 @@ private:
OutputData<double> *m_reference;
};
-typedef boost::shared_ptr<FunctionalTest> FunctionalTest_t;
-
-
#endif
--
GitLab