From d95e748df4452721334f8a35bdc21bacab6882b9 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 10 Jun 2016 18:37:26 +0200
Subject: [PATCH] rm unused
---
Core/TestMachinery/FutestSuite.cpp | 10 +++++-----
Core/TestMachinery/FutestSuite.h | 2 --
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/Core/TestMachinery/FutestSuite.cpp b/Core/TestMachinery/FutestSuite.cpp
index 2a44cc0f468..1d66c20d2eb 100644
--- a/Core/TestMachinery/FutestSuite.cpp
+++ b/Core/TestMachinery/FutestSuite.cpp
@@ -81,13 +81,13 @@ int FutestSuite::execute_subtests()
// run and analyze subtests
int number_of_failed_tests = 0;
for (size_t i = 0; i < n_subtests; ++i) {
- m_subtest_name = subtest_names[i];
- m_test_name = m_info->m_test_name + "_" + m_subtest_name;
- m_subtest_item = subtest_registry->getItem(m_subtest_name);
+ subtest_name = subtest_names[i];
+ m_test_name = m_info->m_test_name + "_" + subtest_name;
+ m_subtest_item = subtest_registry->getItem(subtest_name);
IFutest* subtest( getFutest() );
std::cout << "FutestSuite::execute() -> " << getName()
- << " " << i+1 << "/" << n_subtests << " (" << m_subtest_name << ")\n";
+ << " " << i+1 << "/" << n_subtests << " (" << subtest_name << ")\n";
subtest->runTest();
subtest->analyseResults();
std::cout << *subtest << "\n";
@@ -135,7 +135,7 @@ GISASSimulation* FutestSuite::getSimulation() const
SampleBuilderFactory sample_factory;
std::shared_ptr<class ISampleBuilder> sample_builder(
sample_factory.createItem(m_info->m_sample_builder_name) );
- sample_builder->init_from(this);
+ sample_builder->init_from(this); // passing 'this' enables callbacks like getFormFactor()
result->setSampleBuilder(sample_builder);
return result;
}
diff --git a/Core/TestMachinery/FutestSuite.h b/Core/TestMachinery/FutestSuite.h
index 746789d9e85..74d2ff9dfd1 100644
--- a/Core/TestMachinery/FutestSuite.h
+++ b/Core/TestMachinery/FutestSuite.h
@@ -50,7 +50,6 @@ protected:
virtual class GISASSimulation* getSimulation() const;
virtual OutputData<double>* getReferenceData() const;
std::string getReferenceFileName() const;
- const class FutestInfo* getTestInfo() const { return m_info; }
std::string getTestName() const { return m_test_name; }
std::string getTestDescription() const;
double getTestThreshold() const;
@@ -58,7 +57,6 @@ protected:
private:
const class FutestInfo* m_info;
std::string m_test_name;
- std::string m_subtest_name;
class IParameterized* m_subtest_item;
int execute_onetest();
--
GitLab